igniteui-webcomponents-inputs 1.4.1 → 3.2.1

package/esm5/lib/CalendarView_combined.js

@@ -20,7 +20,7 @@ import { BaseControlTheme_$type } from "igniteui-webcomponents-core";
 import { FirstWeek_$type } from "./FirstWeek";
 import { BrushUtil } from "igniteui-webcomponents-core";
 import { ObservableCollection$1 } from "igniteui-webcomponents-core";
-import { ValueChangedEventArgs } from "./ValueChangedEventArgs";
+import { SelectedValueChangedEventArgs } from "./SelectedValueChangedEventArgs";
 import { CornerRadius } from "igniteui-webcomponents-core";
 import { CalendarVisualModelExport } from "./CalendarVisualModelExport";
 import { ButtonVisualModelExport } from "./ButtonVisualModelExport";
@@ -40,9 +40,10 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _this.n = null;
         _this.o = null;
-        _this.s = null;
-        _this.q = null;
         _this.t = null;
+        _this.q = null;
+        _this.u = null;
+        _this.s = null;
         _this.r = null;
         _this.g = new List$1(DomWrapper_$type, 0);
         _this.f = new List$1(DomWrapper_$type, 0);
@@ -51,10 +52,10 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.i = new List$1(DomWrapper_$type, 0);
         _this.e = new List$1(DomWrapper_$type, 0);
         _this.p = null;
-        _this.v = null;
+        _this.w = null;
         _this.c = null;
         _this.m = null;
-        _this.v = "day";
+        _this.w = "day";
         _this.p = null;
         return _this;
     }
@@ -64,9 +65,9 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
     CalendarView.prototype.l = function () {
         return this.i;
     };
-    CalendarView.prototype.an = function () {
+    CalendarView.prototype.ao = function () {
     };
-    CalendarView.prototype.am = function (a) {
+    CalendarView.prototype.an = function (a) {
         if (a == null) {
             this.m = null;
             return;
@@ -75,18 +76,18 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.m.rootWrapper.setStyleProperty("background-color", "rgb(255, 255, 255)");
         var b = Math.round(a.rootWrapper.width());
         var c = Math.round(a.rootWrapper.height());
-        this.z();
-        this.a1();
+        this.aa();
         this.a2();
-        this.az();
+        this.a3();
+        this.a0();
         var d = this.m.rootWrapper;
-        d.listen("keydown", runOn(this, this.y));
-        d.listen("focus", runOn(this, this.x));
+        d.listen("keydown", runOn(this, this.z));
+        d.listen("focus", runOn(this, this.y));
     };
-    CalendarView.prototype.w = function () {
-        return this.v;
+    CalendarView.prototype.x = function () {
+        return this.w;
     };
-    CalendarView.prototype.z = function () {
+    CalendarView.prototype.aa = function () {
         if (this.m != null) {
             this.n = this.m.createElement("div");
             this.n.setStyleProperty("display", "flex");
@@ -95,16 +96,16 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             this.o = this.m.createElement("div");
             this.o.setStyleProperty("height", "100%");
             this.o.setStyleProperty("width", "100%");
-            this.s = this.m.createElement("div");
-            this.ac();
+            this.t = this.m.createElement("div");
+            this.ad();
             this.n.append(this.o);
             this.m.append(this.n);
             for (var a = 0; a < 42; a++) {
                 var b = this.m.createElement("div");
                 this.f.add(b);
             }
-            this.aa();
-            this.a7();
+            this.ab();
+            this.a8();
             this.q = this.m.createElement("div");
             this.q.setStyleProperty("height", "100%");
             this.m.append(this.q);
@@ -112,34 +113,34 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 var d = this.m.createElement("div");
                 this.h.add(d);
             }
-            this.ab();
+            this.ac();
             for (var e = 0; e < 12; e++) {
                 var f = this.q.getChildAt(e);
-                f.listen("click", runOn(this, this.ah));
+                f.listen("click", runOn(this, this.ai));
             }
             this.q.hide();
-            this.t = this.m.createElement("div");
-            this.t.setStyleProperty("height", "100%");
-            this.m.append(this.t);
+            this.u = this.m.createElement("div");
+            this.u.setStyleProperty("height", "100%");
+            this.m.append(this.u);
             for (var g = 0; g < 7; g++) {
                 var h = this.m.createElement("div");
                 this.j.add(h);
             }
-            this.ad();
+            this.ae();
             for (var i = 0; i < 7; i++) {
-                var j = this.t.getChildAt(i);
-                j.listen("click", runOn(this, this.ba));
+                var j = this.u.getChildAt(i);
+                j.listen("click", runOn(this, this.bd));
             }
-            this.t.listen("wheel", runOn(this, this.bb));
-            this.t.hide();
+            this.u.listen("wheel", runOn(this, this.be));
+            this.u.hide();
         }
     };
-    CalendarView.prototype.ac = function () {
+    CalendarView.prototype.ad = function () {
         if (this.m != null) {
-            this.s.setStyleProperty("display", "flex");
-            this.s.setStyleProperty("flex-direction", "column");
-            this.s.setStyleProperty("padding-top", "26px");
-            this.s.setStyleProperty("width", "12%");
+            this.t.setStyleProperty("display", "flex");
+            this.t.setStyleProperty("flex-direction", "column");
+            this.t.setStyleProperty("padding-top", "26px");
+            this.t.setStyleProperty("width", "12%");
             var a = this.c.ag();
             for (var b = 0; b < 6; b++) {
                 var c = this.m.createElement("div");
@@ -153,43 +154,43 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.setStyleProperty("border-color", "rgb(163, 172, 184)");
                 var d = this.m.createElement("span");
                 d.setAttribute("aria-hidden", "true");
-                d.setStyleProperty("font", "14px \"Segoe UI\", Verdana");
+                d.setStyleProperty("font", "14px Verdana");
                 d.setStyleProperty("color", "rgb(24, 29, 31)");
                 c.append(d);
                 this.i.add(d);
                 d.setText(a._inner[b].toString());
-                this.s.append(c);
+                this.t.append(c);
             }
         }
     };
-    CalendarView.prototype.a3 = function () {
-        if (this.s != null) {
+    CalendarView.prototype.a4 = function () {
+        if (this.t != null) {
             var a = this.c.ag();
             this.i.clear();
             for (var b = 0; b < 6; b++) {
-                var c = this.s.getChildAt(b);
+                var c = this.t.getChildAt(b);
                 var d = c.getChildAt(0);
                 d.setText(a._inner[b].toString());
                 this.i.add(d);
             }
         }
     };
-    CalendarView.prototype.a7 = function () {
-        if (this.s != null) {
+    CalendarView.prototype.a8 = function () {
+        if (this.t != null) {
             if (this.c.af == true) {
-                this.s.show();
-                this.s.setStyleProperty("display", "flex");
-                this.s.parent().setStyleProperty("max-width", "245px");
-                this.s.parent().getChildAt(1).setStyleProperty("width", "88%");
+                this.t.show();
+                this.t.setStyleProperty("width", "12%");
+                this.t.parent().setStyleProperty("max-width", "245px");
+                this.t.parent().getChildAt(1).setStyleProperty("width", "88%");
             }
             else {
-                this.s.hide();
-                this.s.parent().setStyleProperty("max-width", "231px");
-                this.s.parent().getChildAt(1).setStyleProperty("width", "100%");
+                this.t.hide();
+                this.t.parent().setStyleProperty("max-width", "231px");
+                this.t.parent().getChildAt(1).setStyleProperty("width", "100%");
             }
         }
     };
-    CalendarView.prototype.aa = function () {
+    CalendarView.prototype.ab = function () {
         if (this.m != null) {
             this.o.setStyleProperty("display", "flex");
             this.o.setStyleProperty("flex-direction", "column");
@@ -218,8 +219,8 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             f.setStyleProperty("display", "flex");
             f.setStyleProperty("flex-direction", "row");
             f.setStyleProperty("justify-content", "space-evenly");
-            this.s.setStyleProperty("padding-bottom", "6px");
-            f.append(this.s);
+            this.t.setStyleProperty("padding-bottom", "6px");
+            f.append(this.t);
             var g = this.m.createElement("div");
             g.setStyleProperty("display", "flex");
             g.setStyleProperty("flex-direction", "column");
@@ -243,7 +244,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         l.setStyleProperty("vertical-align", "middle");
                         l.setStyleProperty("width", "12%");
                         var m = this.m.createElement("span");
-                        m.setStyleProperty("font", "16px \"Segoe UI\", Verdana");
+                        m.setStyleProperty("font", "16px Verdana");
                         m.setStyleProperty("color", "rgb(24, 29, 31)");
                         l.append(m);
                         this.e.add(m);
@@ -260,7 +261,9 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         var q = this.m.createElement("span");
                         q.setAttribute("aria-hidden", "true");
                         p.append(q);
-                        this.ae(o, p, h);
+                        this.af(o, p, h);
+                        p.parent().setStyleProperty("max-height", "30px");
+                        p.parent().setStyleProperty("display", "flex");
                         o.setStyleProperty("width", "12%");
                         o.setStyleProperty("height", "100%");
                         j.append(o);
@@ -269,31 +272,31 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.append(j);
                 }
             }
-            this.r = this.m.createElement("div");
-            this.r.setStyleProperty("display", "flex");
-            this.r.setStyleProperty("padding-bottom", "4px");
+            this.s = this.m.createElement("div");
+            this.s.setStyleProperty("display", "flex");
+            this.s.setStyleProperty("padding-bottom", "4px");
             var r = this.m.createElement("div");
             r.setStyleProperty("width", "100%");
             r.setStyleProperty("justify-content", "center");
-            var s = this.m.createElement("div");
+            this.r = this.m.createElement("div");
+            this.r.setAttribute("aria-hidden", "true");
+            var s = this.m.createElement("span");
             s.setAttribute("aria-hidden", "true");
-            var t = this.m.createElement("span");
-            t.setAttribute("aria-hidden", "true");
-            s.append(t);
-            this.c.cm(r, s);
-            s.parent().setAttribute("aria-hidden", "true");
-            s.parent().parent().setAttribute("tabindex", "-1");
-            s.parent().parent().setAttribute("aria-readonly", "true");
-            s.parent().parent().setAttribute("aria-selected", "false");
-            s.parent().parent().setAttribute("aria-disabled", "false");
-            s.parent().parent().setAttribute("data-is-focusable", "true");
-            this.r.append(r);
-            this.o.append(this.r);
-            this.a6();
+            this.r.append(s);
+            this.c.cm(r, this.r);
+            this.r.parent().setAttribute("aria-hidden", "true");
+            this.r.parent().parent().setAttribute("tabindex", "-1");
+            this.r.parent().parent().setAttribute("aria-readonly", "true");
+            this.r.parent().parent().setAttribute("aria-selected", "false");
+            this.r.parent().parent().setAttribute("aria-disabled", "false");
+            this.r.parent().parent().setAttribute("data-is-focusable", "true");
+            this.s.append(r);
+            this.o.append(this.s);
+            this.a7();
             this.c.cf();
         }
     };
-    CalendarView.prototype.ab = function () {
+    CalendarView.prototype.ac = function () {
         if (this.m != null) {
             this.q.setStyleProperty("display", "flex");
             this.q.setStyleProperty("flex-direction", "row");
@@ -329,19 +332,29 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.parent().parent().setAttribute("aria-disabled", "false");
                 c.parent().parent().setAttribute("data-is-focusable", "true");
                 c.setAttribute("data-index", a.toString());
-                c.append(e);
                 this.q.append(b);
             }
         }
     };
-    CalendarView.prototype.ad = function () {
+    CalendarView.prototype.bc = function () {
+        for (var a = 0; a < 12; a++) {
+            var b = this.h._inner[a];
+            var c = void 0;
+            var d = a + 1;
+            c = this.c.e(d, a);
+            b.parent().parent().setAttribute("aria-label", c[0]);
+            var e = b.getChildAt(0);
+            e.setText(c[1]);
+        }
+    };
+    CalendarView.prototype.ae = function () {
         if (this.m != null) {
-            this.t.setStyleProperty("width", "100%");
-            this.t.setStyleProperty("height", "100%");
+            this.u.setStyleProperty("width", "100%");
+            this.u.setStyleProperty("height", "100%");
             var a = this.c.aq.getFullYear() - 3;
-            this.t.setStyleProperty("padding", "5px");
-            this.t.setAttribute("role", "grid");
-            this.t.setAttribute("aria-readonly", "true");
+            this.u.setStyleProperty("padding", "5px");
+            this.u.setAttribute("role", "grid");
+            this.u.setAttribute("aria-readonly", "true");
             for (var b = 0; b < 7; b++) {
                 var c = this.m.createElement("div");
                 var d = this.j._inner[b];
@@ -364,21 +377,21 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 a++;
                 d.setAttribute("data-index", b.toString());
                 d.append(f);
-                this.t.append(c);
+                this.u.append(c);
             }
         }
     };
-    CalendarView.prototype.a6 = function () {
+    CalendarView.prototype.a7 = function () {
         if (this.m != null) {
             if (this.c.ae == true) {
-                this.r.setStyleProperty("display", "flex");
+                this.s.setStyleProperty("display", "flex");
             }
             else {
-                this.r.setStyleProperty("display", "none");
+                this.s.setStyleProperty("display", "none");
             }
         }
     };
-    CalendarView.prototype.a1 = function () {
+    CalendarView.prototype.a2 = function () {
         if (this.m != null) {
             var a = this.o.getChildAt(0);
             for (var b = 0; b < 4; b++) {
@@ -392,6 +405,8 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             e.append(f);
             this.c.ck(d, f, e, "prev");
             e.parent().parent().setAttribute("aria-label", "Previous Month");
+            e.parent().setStyleProperty("max-height", "30px");
+            e.parent().setStyleProperty("display", "flex");
             e.setAttribute("data-index", "0");
             this.av(e);
             var g = a.getChildAt(1);
@@ -404,6 +419,9 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var j = this.c.bx();
             i.setText(j);
             h.parent().parent().setAttribute("aria-label", "Select Month");
+            h.parent().setStyleProperty("min-width", "40px");
+            h.parent().setStyleProperty("max-height", "30px");
+            h.parent().setStyleProperty("display", "flex");
             h.setAttribute("data-index", "1");
             this.av(h);
             var k = a.getChildAt(2);
@@ -416,6 +434,9 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var n = this.c.by();
             m.setText(n);
             l.parent().parent().setAttribute("aria-label", "Select Year");
+            l.parent().setStyleProperty("min-width", "40px");
+            l.parent().setStyleProperty("max-height", "30px");
+            l.parent().setStyleProperty("display", "flex");
             l.setAttribute("data-index", "2");
             this.av(l);
             var o = a.getChildAt(3);
@@ -425,6 +446,8 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             p.append(q);
             this.c.ck(o, q, p, "next");
             p.parent().parent().setAttribute("aria-label", "Next Month");
+            p.parent().setStyleProperty("max-height", "30px");
+            p.parent().setStyleProperty("display", "flex");
             p.setAttribute("data-index", "3");
             this.av(p);
             var r = this.c.a();
@@ -436,12 +459,18 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     this.g._inner[s].setAttribute("data-disabled", "false");
                 }
             }
-            d.listen("click", runOn(this, this.ao));
-            o.listen("click", runOn(this, this.aj));
-            g.listen("click", runOn(this, this.ai));
-            k.listen("click", runOn(this, this.bc));
+            d.listen("click", runOn(this, this.ap));
+            o.listen("click", runOn(this, this.ak));
+            g.listen("click", runOn(this, this.aj));
+            k.listen("click", runOn(this, this.bf));
         }
     };
+    CalendarView.prototype.bb = function () {
+        var a = this.g._inner[1];
+        var b = a.getChildAt(0);
+        var c = this.c.bx();
+        b.setText(c);
+    };
     CalendarView.prototype.av = function (a) {
         a.setAttribute("aria-hidden", "true");
         a.parent().setAttribute("aria-hidden", "true");
@@ -453,11 +482,11 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         a.setAttribute("data-section", "header");
         a.setAttribute("data-disabled", "false");
     };
-    CalendarView.prototype.a2 = function () {
+    CalendarView.prototype.a3 = function () {
         if (this.m != null) {
             var a = this.o.getChildAt(1).getChildAt(1).getChildAt(0);
             var b = new List$1(DayOfWeek_$type, 0);
-            switch (this.c.p) {
+            switch (this.c.l) {
                 case 0:
                     b.add(0);
                     b.add(1);
@@ -534,22 +563,22 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    CalendarView.prototype.az = function () {
+    CalendarView.prototype.a0 = function () {
         if (this.m != null) {
-            this.a0();
-            this.a3();
+            this.a1();
+            this.a4();
             var a = this.o.getChildAt(1);
             var b = a.getChildAt(1);
             for (var c = 1; c < 7; c++) {
                 var d = b.getChildAt(c);
                 for (var e = 0; e < 7; e++) {
                     var f = d.getChildAt(e);
-                    f.listen("click", runOn(this, this.af));
+                    f.listen("click", runOn(this, this.ag));
                 }
             }
         }
     };
-    CalendarView.prototype.a0 = function (a, b) {
+    CalendarView.prototype.a1 = function (a, b) {
         if (a === void 0) {
             a = false;
         }
@@ -560,13 +589,13 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var c = null;
             var d = null;
             var e = null;
-            var f = this.c.aw;
+            var f = this.c.value;
             var g = this.c.aq;
             var h = this.c.av;
             for (var i = 0; i < 42; i++) {
                 var j = this.f._inner[i];
                 var k = j.getChildAt(0);
-                var l = this.c.n(i);
+                var l = this.c.j(i);
                 if (l != null) {
                     j.parent().parent().setAttribute("aria-label", l.c.toString() + "/" + l.b.toString() + "/" + l.d.toString());
                     j.setAttribute("data-section", "days");
@@ -604,7 +633,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 else if (e != null) {
                     if (b == true) {
                         for (var n = 41; n >= 0; n--) {
-                            var o = this.c.n(n);
+                            var o = this.c.j(n);
                             if (o.c == dateGetMonth(g)) {
                                 var p = this.f._inner[n];
                                 var q = p.getAttribute("data-disabled");
@@ -617,7 +646,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                     else {
                         for (var r = 0; r < 42; r++) {
-                            var s = this.c.n(r);
+                            var s = this.c.j(r);
                             if (s.c == dateGetMonth(g)) {
                                 var t = this.f._inner[r];
                                 var u = t.getAttribute("data-disabled");
@@ -633,7 +662,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    CalendarView.prototype.ae = function (a, b, c) {
+    CalendarView.prototype.af = function (a, b, c) {
         if (this.m != null) {
             b.setAttribute("aria-hidden", "true");
             var d = this.m.createElement("span");
@@ -655,10 +684,10 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var d = c.getExternal(b, c.rootWrapper, c.getExternal(this.c, null, null));
         }
     };
-    CalendarView.prototype.ar = function (a, b) {
-        var c = a.getChildAt(0);
-        c.setText(b);
-        a.parent().parent().setAttribute("aria-label", b);
+    CalendarView.prototype.az = function (a) {
+        var b = this.r.getChildAt(0);
+        b.setText(a);
+        this.r.parent().parent().setAttribute("aria-label", a);
     };
     CalendarView.prototype.aw = function (a, b) {
         if (this.m != null) {
@@ -685,8 +714,8 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             b = false;
         }
         if (this.m != null) {
-            this.a0(a, b);
-            this.a3();
+            this.a1(a, b);
+            this.a4();
             var c = this.c.a();
             for (var d = 0; d < this.g.count; d++) {
                 if (c[d] == true) {
@@ -712,7 +741,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.setAttribute("data-disabled", "false");
                     g.parent().parent().setAttribute("aria-selected", "false");
                     var h = f + 1;
-                    var i = this.c.aw;
+                    var i = this.c.value;
                     var j = this.c.av;
                     if (+i != +(dateMinValue()) && dateGetMonth(i) == h) {
                         b = g;
@@ -749,21 +778,21 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     this.d(this.h._inner[e]);
                 }
                 else {
-                    this.aq();
+                    this.ar();
                 }
             }
         }
     };
-    CalendarView.prototype.a5 = function () {
+    CalendarView.prototype.a6 = function () {
         if (this.m != null) {
             if (this.j.count != 0) {
                 var a = this.c.aq.getFullYear();
                 var b = true;
-                this.a4(a, b);
+                this.a5(a, b);
             }
         }
     };
-    CalendarView.prototype.a4 = function (a, b) {
+    CalendarView.prototype.a5 = function (a, b) {
         if (b === void 0) {
             b = false;
         }
@@ -802,19 +831,19 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    CalendarView.prototype.aq = function (a) {
+    CalendarView.prototype.ar = function (a) {
         if (a === void 0) {
             a = false;
         }
         this.at();
         this.ay();
-        this.v = "day";
+        this.w = "day";
         this.n.show();
         this.n.setStyleProperty("display", "flex");
         this.q.hide();
-        this.t.hide();
+        this.u.hide();
         this.au(a);
-        this.ag();
+        this.ah();
     };
     CalendarView.prototype.au = function (a) {
         if (a === void 0) {
@@ -871,12 +900,12 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.p = a;
         return true;
     };
-    CalendarView.prototype.ag = function () {
+    CalendarView.prototype.ah = function () {
         if (this.p != null) {
             this.p.parent().parent().focus(false);
         }
     };
-    CalendarView.prototype.ap = function (a, b) {
+    CalendarView.prototype.aq = function (a, b) {
         if (a === void 0) {
             a = true;
         }
@@ -891,7 +920,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.at(a, b);
         this.ay();
     };
-    CalendarView.prototype.ak = function (a, b) {
+    CalendarView.prototype.al = function (a, b) {
         if (a === void 0) {
             a = true;
         }
@@ -906,28 +935,28 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.at(a, b);
         this.ay();
     };
-    CalendarView.prototype.a8 = function () {
+    CalendarView.prototype.a9 = function () {
         this.n.hide();
         this.q.show();
         this.q.setStyleProperty("display", "flex");
-        this.t.hide();
-        this.v = "month";
+        this.u.hide();
+        this.w = "month";
         this.ax();
-        this.ag();
+        this.ah();
     };
-    CalendarView.prototype.a9 = function () {
+    CalendarView.prototype.ba = function () {
         this.n.hide();
         this.q.hide();
-        this.t.show();
-        this.v = "year";
-        this.a5();
-        this.ag();
-    };
-    CalendarView.prototype.x = function (a) {
+        this.u.show();
+        this.w = "year";
+        this.a6();
+        this.ah();
     };
     CalendarView.prototype.y = function (a) {
+    };
+    CalendarView.prototype.z = function (a) {
         var b = a.which;
-        if (this.v == "day") {
+        if (this.w == "day") {
             var c = this.p.getAttribute("data-section").toString();
             var d = parseInt(this.p.getAttribute("data-index").toString());
             if (c == "header") {
@@ -939,14 +968,14 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                             e = this.g._inner[d - 2];
                             this.d(e);
                         }
-                        this.ag();
+                        this.ah();
                     }
                     else {
-                        this.ap(false);
+                        this.aq(false);
                         var g = parseBool(this.p.getAttribute("data-disabled").toString());
                         if (g == true) {
                             this.au();
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
@@ -958,14 +987,14 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                             h = this.g._inner[d + 2];
                             this.d(h);
                         }
-                        this.ag();
+                        this.ah();
                     }
                     else {
-                        this.ak(false);
+                        this.al(false);
                         var j = parseBool(this.p.getAttribute("data-disabled").toString());
                         if (j == true) {
                             this.au();
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
@@ -976,22 +1005,22 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                     else {
                         a.preventDefault();
                         this.at(true);
-                        this.ag();
+                        this.ah();
                     }
                 }
                 else if (b == 13) {
                     a.preventDefault();
                     if (d == 0) {
-                        this.ap(false);
+                        this.aq(false);
                     }
                     else if (d == 1) {
-                        this.a8();
+                        this.a9();
                     }
                     else if (d == 2) {
-                        this.a9();
+                        this.ba();
                     }
                     else if (d == 3) {
-                        this.ak(false);
+                        this.al(false);
                     }
                 }
             }
@@ -1001,8 +1030,8 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 var m = k[1];
                 if (b == 37) {
                     if (d == 0) {
-                        this.ap(true, true);
-                        this.ag();
+                        this.aq(true, true);
+                        this.ah();
                     }
                     else {
                         var n = this.f._inner[d - 1];
@@ -1011,20 +1040,20 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         var q = o[1];
                         if (m == q) {
                             this.d(n);
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ap();
-                            var r = this.u(p, q);
+                            this.aq();
+                            var r = this.v(p, q);
                             this.d(r);
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
                 else if (b == 39) {
                     if (d == 41) {
-                        this.ak(true, false);
-                        this.ag();
+                        this.al(true, false);
+                        this.ah();
                     }
                     else {
                         var s = this.f._inner[d + 1];
@@ -1033,28 +1062,28 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         var v = t[1];
                         if (m == v) {
                             this.d(s);
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ak();
-                            var w = this.u(u, v);
+                            this.al();
+                            var w = this.v(u, v);
                             this.d(w);
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
                 else if (b == 40) {
                     if (d >= 35) {
-                        this.ak();
-                        var x = this.u(l, m);
+                        this.al();
+                        var x = this.v(l, m);
                         var y = parseInt(x.getAttribute("data-index").toString());
                         var z = this.f._inner[y + 7];
                         var aa = z.getAttribute("data-date").toString().split('/');
                         var ab = aa[0];
                         var ac = aa[1];
-                        var ad = this.u(ab, ac);
+                        var ad = this.v(ab, ac);
                         this.d(ad);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         var ae = this.f._inner[d + 7];
@@ -1063,28 +1092,28 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         var ah = af[1];
                         if (m == ah) {
                             this.d(ae);
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ak();
-                            var ai = this.u(ag, ah);
+                            this.al();
+                            var ai = this.v(ag, ah);
                             this.d(ai);
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
                 else if (b == 38) {
                     if (d <= 6) {
-                        this.ap();
-                        var aj = this.u(l, m);
+                        this.aq();
+                        var aj = this.v(l, m);
                         var ak = parseInt(aj.getAttribute("data-index").toString());
                         var al = this.f._inner[ak - 7];
                         var am = al.getAttribute("data-date").toString().split('/');
                         var an = am[0];
                         var ao = am[1];
-                        var ap = this.u(an, ao);
+                        var ap = this.v(an, ao);
                         this.d(ap);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         var aq = this.f._inner[d - 7];
@@ -1093,30 +1122,30 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                         var at = ar[1];
                         if (m == at) {
                             this.d(aq);
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ap();
-                            var au = this.u(as, at);
+                            this.aq();
+                            var au = this.v(as, at);
                             this.d(au);
-                            this.ag();
+                            this.ah();
                         }
                     }
                 }
                 else if (b == 34) {
-                    this.ak();
-                    this.ag();
+                    this.al();
+                    this.ah();
                 }
                 else if (b == 33) {
-                    this.ap();
-                    this.ag();
+                    this.aq();
+                    this.ah();
                 }
                 else if (b == 9) {
                     if (a.shiftKey) {
                         a.preventDefault();
                         var av = this.g._inner[1];
                         this.d(av);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         this.c.cs();
@@ -1124,89 +1153,89 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        else if (this.v == "month") {
+        else if (this.w == "month") {
             var aw = parseInt(this.p.getAttribute("data-index").toString());
             if (b == 37) {
                 if (aw == 0) {
                     var ax = this.h._inner[11];
                     this.d(ax);
-                    this.ag();
+                    this.ah();
                 }
                 else {
                     var ay = this.h._inner[aw - 1];
                     this.d(ay);
-                    this.ag();
+                    this.ah();
                 }
             }
             else if (b == 39) {
                 if (aw == 11) {
                     var az = this.h._inner[0];
                     this.d(az);
-                    this.ag();
+                    this.ah();
                 }
                 else {
                     var a0 = this.h._inner[aw + 1];
                     this.d(a0);
-                    this.ag();
+                    this.ah();
                 }
             }
             else if (b == 40) {
                 if (aw >= 9) {
                     var a1 = this.h._inner[aw - 9];
                     this.d(a1);
-                    this.ag();
+                    this.ah();
                 }
                 else {
                     var a2 = this.h._inner[aw + 3];
                     this.d(a2);
-                    this.ag();
+                    this.ah();
                 }
             }
             else if (b == 38) {
                 if (aw <= 2) {
                     var a3 = this.h._inner[aw + 9];
                     this.d(a3);
-                    this.ag();
+                    this.ah();
                 }
                 else {
                     var a4 = this.h._inner[aw - 3];
                     this.d(a4);
-                    this.ag();
+                    this.ah();
                 }
             }
             else if (b == 13) {
                 this.d(this.g._inner[1]);
-                this.ag();
+                this.ah();
             }
         }
-        else if (this.v == "year") {
+        else if (this.w == "year") {
             var a5 = parseInt(this.p.getAttribute("data-index").toString());
             var a6 = parseInt(this.j._inner[3].getChildAt(0).getText());
             if (b == 40) {
                 this.c.cz(a6, 1);
-                this.ag();
+                this.ah();
             }
             else if (b == 38) {
                 this.c.cz(a6, -1);
-                this.ag();
+                this.ah();
             }
             else if (b == 13) {
                 this.d(this.g._inner[2]);
-                this.ag();
+                this.ah();
             }
         }
         if (b == 27) {
-            this.aq();
+            this.ar();
             this.c.cs();
         }
         if (a.altKey == true) {
             if (b == 38) {
-                this.aq();
+                this.ar();
                 this.c.cs();
             }
         }
     };
-    CalendarView.prototype.u = function (a, b) {
+    CalendarView.prototype.v = function (a, b) {
         var c = null;
         var d = null;
         for (var e = 0; e < 42; e++) {
@@ -1227,39 +1256,39 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    CalendarView.prototype.ao = function (a) {
+    CalendarView.prototype.ap = function (a) {
         var b = this.g._inner[0];
         var c = parseBool(b.getAttribute("data-disabled").toString());
         if (c == true) {
             return;
         }
-        this.ap();
+        this.aq();
     };
-    CalendarView.prototype.aj = function (a) {
+    CalendarView.prototype.ak = function (a) {
         var b = this.g._inner[3];
         var c = parseBool(b.getAttribute("data-disabled").toString());
         if (c == true) {
             return;
         }
-        this.ak();
+        this.al();
     };
-    CalendarView.prototype.ai = function (a) {
+    CalendarView.prototype.aj = function (a) {
         var b = this.g._inner[1];
         var c = parseBool(b.getAttribute("data-disabled").toString());
         if (c == true) {
             return;
         }
-        this.a8();
+        this.a9();
     };
-    CalendarView.prototype.bc = function (a) {
+    CalendarView.prototype.bf = function (a) {
         var b = this.g._inner[2];
         var c = parseBool(b.getAttribute("data-disabled").toString());
         if (c == true) {
             return;
         }
-        this.a9();
+        this.ba();
     };
-    CalendarView.prototype.af = function (e_) {
+    CalendarView.prototype.ag = function (e_) {
         var a = (e_.originalEvent.currentTarget);
         var b = a.innerText;
         if (b != "") {
@@ -1273,7 +1302,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    CalendarView.prototype.ah = function (e_) {
+    CalendarView.prototype.ai = function (e_) {
         var a = (e_.originalEvent.currentTarget);
         var b = a.getAttribute("data-month").toString();
         if (b != "") {
@@ -1282,11 +1311,11 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var e = parseBool(d.getAttribute("data-disabled").toString());
             if (e == false) {
                 this.c.cd(c);
-                this.aq();
+                this.ar();
             }
         }
     };
-    CalendarView.prototype.ba = function (e_) {
+    CalendarView.prototype.bd = function (e_) {
         var a = (e_.originalEvent.currentTarget);
         var b = a.innerText;
         if (b != "") {
@@ -1295,11 +1324,11 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
             var e = parseBool(d.getAttribute("data-disabled").toString());
             if (e == false) {
                 this.c.ce(c);
-                this.aq();
+                this.ar();
             }
         }
     };
-    CalendarView.prototype.bb = function (e_) {
+    CalendarView.prototype.be = function (e_) {
         e_.preventDefault();
         var a = (e_.originalEvent.deltaY);
         var b = parseInt(this.j._inner[3].getChildAt(0).getText());
@@ -1323,7 +1352,7 @@ var CalendarView = /** @class */ /*@__PURE__*/ (function (_super) {
         d[1] = c;
         return d;
     };
-    CalendarView.prototype.al = function () {
+    CalendarView.prototype.am = function () {
     };
     CalendarView.$t = markType(CalendarView, 'CalendarView');
     return CalendarView;
@@ -1336,7 +1365,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     tslib_1.__extends(XCalendar, _super);
     function XCalendar() {
         var _this = _super.call(this) || this;
-        _this.l = null;
+        _this.h = null;
         _this.aq = dateNow();
         _this.am = new Date();
         _this.ai = null;
@@ -1344,32 +1373,32 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.ah = null;
         _this.ak = null;
         _this.al = null;
-        _this.k = null;
+        _this.g = null;
         _this.ap = dateMinValue();
         _this.propertyChanged = null;
         _this.close = null;
-        _this.valueChanged = null;
+        _this.selectedValueChanged = null;
         _this.w = null;
         _this.as = dateMinValue();
         _this.ar = dateNow();
         _this.ao = dateMinValue();
         _this.an = dateMaxValue();
-        _this.h = 3;
-        _this.f = 1;
-        _this.c5 = BrushUtil.g(0, 255, 255, 255);
-        _this.db = BrushUtil.g(255, 33, 150, 243);
-        _this.dd = BrushUtil.g(255, 21, 112, 184);
-        _this.c8 = BrushUtil.g(76, 33, 150, 243);
-        _this.da = BrushUtil.g(50, 186, 191, 199);
-        _this.de = BrushUtil.g(255, 24, 29, 31);
-        _this.dc = BrushUtil.g(255, 255, 255, 255);
-        _this.c9 = BrushUtil.g(255, 24, 29, 31);
+        _this.s = 3;
+        _this.q = 1;
+        _this.c6 = BrushUtil.g(0, 255, 255, 255);
+        _this.dc = BrushUtil.g(255, 33, 150, 243);
+        _this.de = BrushUtil.g(255, 21, 112, 184);
+        _this.c9 = BrushUtil.g(76, 33, 150, 243);
+        _this.db = BrushUtil.g(50, 186, 191, 199);
+        _this.df = BrushUtil.g(255, 24, 29, 31);
+        _this.dd = BrushUtil.g(255, 255, 255, 255);
+        _this.da = BrushUtil.g(255, 24, 29, 31);
+        _this.c8 = BrushUtil.g(255, 33, 150, 243);
         _this.c7 = BrushUtil.g(255, 33, 150, 243);
-        _this.c6 = BrushUtil.g(255, 33, 150, 243);
         _this.y = false;
         _this.u = null;
-        _this.o = 0;
-        _this.r = 0;
+        _this.k = 0;
+        _this.n = 0;
         _this.z = false;
         _this.am = dateAddYears(_this.am, -200);
         _this.ai = new ObservableCollection$1(DayInfo.$, 0);
@@ -1379,8 +1408,8 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         _this.al = new ObservableCollection$1(XButton.$, 0);
         var a = new CalendarView();
         a.c = _this;
-        _this.l = a;
-        _this.l.an();
+        _this.h = a;
+        _this.h.ao();
         return _this;
     }
     XCalendar.prototype.cs = function () {
@@ -1391,16 +1420,16 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     XCalendar.prototype.cu = function (a) {
         var b = this.as;
         this.as = a;
-        if (this.valueChanged != null) {
-            this.valueChanged(this, ((function () {
-                var $ret = new ValueChangedEventArgs();
+        if (this.selectedValueChanged != null) {
+            this.selectedValueChanged(this, ((function () {
+                var $ret = new SelectedValueChangedEventArgs();
                 $ret.oldValue = b;
                 $ret.newValue = a;
                 return $ret;
             })()));
         }
-        if (+(this.aw) != +(dateMinValue())) {
-            this.aq = this.aw;
+        if (+(this.value) != +(dateMinValue())) {
+            this.aq = this.value;
         }
         this.cx();
     };
@@ -1409,22 +1438,22 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         this.cu(d);
     };
     XCalendar.prototype.notifySizeChanged = function () {
-        this.l.al();
+        this.h.am();
     };
     XCalendar.prototype.destroy = function () {
-        if (this.k != null) {
-            var a = this.k;
+        if (this.g != null) {
+            var a = this.g;
             a.clicked = delegateRemove(a.clicked, runOn(this, this.c2));
         }
         this.provideContainer(null);
     };
     XCalendar.prototype.provideContainer = function (a) {
-        this.l.am(a);
+        this.h.an(a);
     };
     Object.defineProperty(XCalendar.prototype, "x", {
         get: function () {
             if (this.w == null) {
-                this.w = new SRProvider(this.l.m);
+                this.w = new SRProvider(this.h.m);
                 this.w.cb("Calendar");
             }
             return this.w;
@@ -1432,7 +1461,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "aw", {
+    Object.defineProperty(XCalendar.prototype, "value", {
         get: function () {
             return this.as;
         },
@@ -1489,169 +1518,169 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "i", {
+    Object.defineProperty(XCalendar.prototype, "t", {
         get: function () {
-            return this.h;
+            return this.s;
         },
         set: function (a) {
-            var b = this.h;
-            this.h = a;
-            if (b != this.h) {
-                this.ct("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, this.h));
+            var b = this.s;
+            this.s = a;
+            if (b != this.s) {
+                this.ct("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, this.s));
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "g", {
+    Object.defineProperty(XCalendar.prototype, "r", {
         get: function () {
-            return this.f;
+            return this.q;
         },
         set: function (a) {
-            var b = this.f;
-            this.f = a;
-            if (b != this.f) {
-                this.ct("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, this.f));
+            var b = this.q;
+            this.q = a;
+            if (b != this.q) {
+                this.ct("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, this.q));
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "df", {
+    Object.defineProperty(XCalendar.prototype, "dg", {
         get: function () {
-            return this.c5;
+            return this.c6;
         },
         set: function (a) {
-            var b = this.c5;
-            this.c5 = a;
-            if (b != this.c5) {
-                this.ct("BackgroundColor", b, this.c5);
+            var b = this.c6;
+            this.c6 = a;
+            if (b != this.c6) {
+                this.ct("BackgroundColor", b, this.c6);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dl", {
+    Object.defineProperty(XCalendar.prototype, "dm", {
         get: function () {
-            return this.db;
+            return this.dc;
         },
         set: function (a) {
-            var b = this.db;
-            this.db = a;
-            if (b != this.db) {
-                this.ct("SelectedDateBackgroundColor", b, this.db);
+            var b = this.dc;
+            this.dc = a;
+            if (b != this.dc) {
+                this.ct("SelectedDateBackgroundColor", b, this.dc);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dn", {
+    Object.defineProperty(XCalendar.prototype, "dp", {
         get: function () {
-            return this.dd;
+            return this.de;
         },
         set: function (a) {
-            var b = this.dd;
-            this.dd = a;
-            if (b != this.dd) {
-                this.ct("SelectedFocusDateBackgroundColor", b, this.dd);
+            var b = this.de;
+            this.de = a;
+            if (b != this.de) {
+                this.ct("SelectedFocusDateBackgroundColor", b, this.de);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "di", {
+    Object.defineProperty(XCalendar.prototype, "dj", {
         get: function () {
-            return this.c8;
+            return this.c9;
         },
         set: function (a) {
-            var b = this.c8;
-            this.c8 = a;
-            if (b != this.c8) {
-                this.ct("FocusDateBackgroundColor", b, this.c8);
+            var b = this.c9;
+            this.c9 = a;
+            if (b != this.c9) {
+                this.ct("FocusDateBackgroundColor", b, this.c9);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dk", {
+    Object.defineProperty(XCalendar.prototype, "dl", {
         get: function () {
-            return this.da;
+            return this.db;
         },
         set: function (a) {
-            var b = this.da;
-            this.da = a;
-            if (b != this.da) {
-                this.ct("HoverBackgroundColor", b, this.da);
+            var b = this.db;
+            this.db = a;
+            if (b != this.db) {
+                this.ct("HoverBackgroundColor", b, this.db);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dp", {
+    Object.defineProperty(XCalendar.prototype, "dq", {
         get: function () {
-            return this.de;
+            return this.df;
         },
         set: function (a) {
-            var b = this.de;
-            this.de = a;
-            if (b != this.de) {
-                this.ct("TextColor", b, this.de);
+            var b = this.df;
+            this.df = a;
+            if (b != this.df) {
+                this.ct("TextColor", b, this.df);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dm", {
+    Object.defineProperty(XCalendar.prototype, "dn", {
         get: function () {
-            return this.dc;
+            return this.dd;
         },
         set: function (a) {
-            var b = this.dc;
-            this.dc = a;
-            if (b != this.dc) {
-                this.ct("SelectedDateTextColor", b, this.dc);
+            var b = this.dd;
+            this.dd = a;
+            if (b != this.dd) {
+                this.ct("SelectedDateTextColor", b, this.dd);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dj", {
+    Object.defineProperty(XCalendar.prototype, "dk", {
         get: function () {
-            return this.c9;
+            return this.da;
         },
         set: function (a) {
-            var b = this.c9;
-            this.c9 = a;
-            if (b != this.c9) {
-                this.ct("FocusDateTextColor", b, this.c9);
+            var b = this.da;
+            this.da = a;
+            if (b != this.da) {
+                this.ct("FocusDateTextColor", b, this.da);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dh", {
+    Object.defineProperty(XCalendar.prototype, "di", {
         get: function () {
-            return this.c7;
+            return this.c8;
         },
         set: function (a) {
-            var b = this.c7;
-            this.c7 = a;
-            if (b != this.c7) {
-                this.ct("CurrentDateTextColor", b, this.c7);
+            var b = this.c8;
+            this.c8 = a;
+            if (b != this.c8) {
+                this.ct("CurrentDateTextColor", b, this.c8);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "dg", {
+    Object.defineProperty(XCalendar.prototype, "dh", {
         get: function () {
-            return this.c6;
+            return this.c7;
         },
         set: function (a) {
-            var b = this.c6;
-            this.c6 = a;
-            if (b != this.c6) {
-                this.ct("CurrentDateBorderColor", b, this.c6);
+            var b = this.c7;
+            this.c7 = a;
+            if (b != this.c7) {
+                this.ct("CurrentDateBorderColor", b, this.c7);
             }
         },
         enumerable: true,
@@ -1685,29 +1714,29 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "p", {
+    Object.defineProperty(XCalendar.prototype, "l", {
         get: function () {
-            return this.o;
+            return this.k;
         },
         set: function (a) {
-            var b = this.o;
-            this.o = a;
-            if (b != this.o) {
-                this.ct("FirstDayOfWeek", enumGetBox(DayOfWeek_$type, b), enumGetBox(DayOfWeek_$type, this.o));
+            var b = this.k;
+            this.k = a;
+            if (b != this.k) {
+                this.ct("FirstDayOfWeek", enumGetBox(DayOfWeek_$type, b), enumGetBox(DayOfWeek_$type, this.k));
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(XCalendar.prototype, "s", {
+    Object.defineProperty(XCalendar.prototype, "o", {
         get: function () {
-            return this.r;
+            return this.n;
         },
         set: function (a) {
-            var b = this.r;
-            this.r = a;
-            if (b != this.r) {
-                this.ct("FirstWeekOfYear", enumGetBox(FirstWeek_$type, b), enumGetBox(FirstWeek_$type, this.r));
+            var b = this.n;
+            this.n = a;
+            if (b != this.n) {
+                this.ct("FirstWeekOfYear", enumGetBox(FirstWeek_$type, b), enumGetBox(FirstWeek_$type, this.n));
             }
         },
         enumerable: true,
@@ -1742,14 +1771,14 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.c1();
                 break;
             case "Value":
-                if (+(this.aw) != +(dateMinValue())) {
-                    if (dateGetDate(this.aw) < dateGetDate(this.au) || dateGetDate(this.aw) > dateGetDate(this.at)) {
-                        this.aw = this.ap;
+                if (+(this.value) != +(dateMinValue())) {
+                    if (dateGetDate(this.value) < dateGetDate(this.au) || dateGetDate(this.value) > dateGetDate(this.at)) {
+                        this.value = this.ap;
                     }
                 }
-                this.ap = this.aw;
-                if (+(this.aw) != +(dateMinValue())) {
-                    this.aq = this.aw;
+                this.ap = this.value;
+                if (+(this.value) != +(dateMinValue())) {
+                    this.aq = this.value;
                 }
                 this.cx();
                 break;
@@ -1762,7 +1791,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                 else if (e > 0) {
                     this.ar = this.at;
                 }
-                if (+(this.aw) == +(dateMinValue())) {
+                if (+(this.value) == +(dateMinValue())) {
                     this.aq = this.av;
                 }
                 this.cx();
@@ -1799,85 +1828,85 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.c4();
                 break;
             case "ShowTodayButton":
-                this.l.a6();
+                this.h.a7();
                 break;
             case "FirstDayOfWeek":
                 this.cx();
                 break;
             case "FirstWeekOfYear":
             case "ShowWeekNumbers":
-                this.l.a7();
+                this.h.a8();
                 this.cx();
                 break;
         }
     };
     XCalendar.prototype.c3 = function () {
         for (var a = 0; a < this.aj.count; a++) {
-            if (this.dp != null) {
-                this.aj._inner[a].s5 = this.dp;
+            if (this.dq != null) {
+                this.aj._inner[a].s5 = this.dq;
             }
-            if (this.dj != null) {
-                this.aj._inner[a].s1 = this.dj;
+            if (this.dk != null) {
+                this.aj._inner[a].s1 = this.dk;
             }
-            if (this.df != null) {
-                this.aj._inner[a].sv = this.df;
+            if (this.dg != null) {
+                this.aj._inner[a].sv = this.dg;
             }
-            if (this.di != null) {
-                this.aj._inner[a].s0 = this.di;
+            if (this.dj != null) {
+                this.aj._inner[a].s0 = this.dj;
             }
-            if (this.dk != null) {
-                this.aj._inner[a].s2 = this.dk;
+            if (this.dl != null) {
+                this.aj._inner[a].s2 = this.dl;
             }
         }
         for (var b = 0; b < this.ah.count; b++) {
-            if (this.dp != null) {
-                this.ah._inner[b].s5 = this.dp;
+            if (this.dq != null) {
+                this.ah._inner[b].s5 = this.dq;
             }
-            if (this.dj != null) {
-                this.ah._inner[b].s1 = this.dj;
+            if (this.dk != null) {
+                this.ah._inner[b].s1 = this.dk;
             }
-            if (this.df != null) {
-                this.ah._inner[b].sv = this.df;
+            if (this.dg != null) {
+                this.ah._inner[b].sv = this.dg;
             }
-            if (this.di != null) {
-                this.ah._inner[b].s0 = this.di;
+            if (this.dj != null) {
+                this.ah._inner[b].s0 = this.dj;
             }
-            if (this.dk != null) {
-                this.ah._inner[b].s2 = this.dk;
+            if (this.dl != null) {
+                this.ah._inner[b].s2 = this.dl;
             }
         }
         for (var c = 0; c < this.ak.count; c++) {
-            if (this.dp != null) {
-                this.ak._inner[c].s5 = this.dp;
+            if (this.dq != null) {
+                this.ak._inner[c].s5 = this.dq;
             }
-            if (this.dj != null) {
-                this.ak._inner[c].s1 = this.dj;
+            if (this.dk != null) {
+                this.ak._inner[c].s1 = this.dk;
             }
-            if (this.df != null) {
-                this.ak._inner[c].sv = this.df;
+            if (this.dg != null) {
+                this.ak._inner[c].sv = this.dg;
             }
-            if (this.di != null) {
-                this.ak._inner[c].s0 = this.di;
+            if (this.dj != null) {
+                this.ak._inner[c].s0 = this.dj;
             }
-            if (this.dk != null) {
-                this.ak._inner[c].s2 = this.dk;
+            if (this.dl != null) {
+                this.ak._inner[c].s2 = this.dl;
             }
         }
         for (var d = 0; d < this.al.count; d++) {
-            if (this.dp != null) {
-                this.al._inner[d].s5 = this.dp;
+            if (this.dq != null) {
+                this.al._inner[d].s5 = this.dq;
             }
-            if (this.dj != null) {
-                this.al._inner[d].s1 = this.dj;
+            if (this.dk != null) {
+                this.al._inner[d].s1 = this.dk;
             }
-            if (this.df != null) {
-                this.al._inner[d].sv = this.df;
+            if (this.dg != null) {
+                this.al._inner[d].sv = this.dg;
             }
-            if (this.di != null) {
-                this.al._inner[d].s0 = this.di;
+            if (this.dj != null) {
+                this.al._inner[d].s0 = this.dj;
             }
-            if (this.dk != null) {
-                this.al._inner[d].s2 = this.dk;
+            if (this.dl != null) {
+                this.al._inner[d].s2 = this.dl;
             }
         }
     };
@@ -1904,35 +1933,43 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     XCalendar.prototype.cq = function () {
-        this.l.au();
-        this.l.ag();
+        this.cx();
+        this.h.au();
+        this.h.ah();
     };
     XCalendar.prototype.c1 = function () {
     };
     XCalendar.prototype.c0 = function () {
     };
     XCalendar.prototype.ch = function () {
-        this.aw = dateMinValue();
-        this.l.at();
+        this.value = dateMinValue();
+        this.h.at();
     };
     XCalendar.prototype.cx = function () {
-        this.l.a2();
+        this.c5();
+        this.h.a3();
         this.cg();
-        this.l.ay();
-        this.l.a5();
-        this.l.at();
+        this.h.ay();
+        this.h.a6();
+        this.h.at();
+    };
+    XCalendar.prototype.c5 = function () {
+        var a = !stringIsNullOrWhiteSpace(this.x.b1("Today")) ? this.x.b1("Today") : "Today";
+        this.h.az(a);
+        this.h.bc();
+        this.h.bb();
     };
     XCalendar.prototype.cf = function () {
         this.cg();
     };
     XCalendar.prototype.ci = function (a, b, c) {
         var d = new XButton();
-        this.l.as(a, d);
-        d.d = this.g;
-        d.h = this.i;
+        this.h.as(a, d);
+        d.i = this.r;
+        d.m = this.t;
         d.v = this.u;
         d.eu = -1;
-        d.s = 1;
+        d.e = 1;
         if (this.u != null) {
             d.v = this.u;
         }
@@ -1941,11 +1978,11 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         d.kv = e;
         d.ec = 0;
         d.appendButtonContent(b);
-        d.s5 = this.dp;
-        d.s1 = this.dj;
-        d.sv = this.df;
-        d.s0 = this.di;
-        d.s2 = this.dk;
+        d.s5 = this.dq;
+        d.s1 = this.dk;
+        d.sv = this.dg;
+        d.s0 = this.dj;
+        d.s2 = this.dl;
         d.bh = 30;
         d.bg = 30;
         this.ah.add(d);
@@ -1953,12 +1990,12 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XCalendar.prototype.cm = function (a, b) {
         var c = new XButton();
-        this.l.as(a, c);
-        c.d = this.g;
-        c.h = this.i;
+        this.h.as(a, c);
+        c.i = this.r;
+        c.m = this.t;
         c.v = this.u;
         c.eu = -1;
-        c.s = 1;
+        c.e = 1;
         if (this.u != null) {
             c.v = this.u;
         }
@@ -1968,29 +2005,29 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         c.ec = 0;
         c.appendButtonContent(b);
         var e = !stringIsNullOrWhiteSpace(this.x.b1("Today")) ? this.x.b1("Today") : "Today";
-        this.l.ar(b, e);
-        c.s5 = this.dp;
-        c.s1 = this.dj;
-        c.sv = this.df;
-        c.s0 = this.di;
-        c.s2 = this.dk;
-        this.k = c;
-        var f = this.k;
+        this.h.az(e);
+        c.s5 = this.dq;
+        c.s1 = this.dk;
+        c.sv = this.dg;
+        c.s0 = this.dj;
+        c.s2 = this.dl;
+        this.g = c;
+        var f = this.g;
         f.clicked = delegateCombine(f.clicked, runOn(this, this.c2));
     };
     XCalendar.prototype.c2 = function (a, b) {
         this.aq = this.av;
         this.cg();
-        this.l.aq(true);
+        this.h.ar(true);
     };
     XCalendar.prototype.cl = function (a, b) {
         var c = new XButton();
-        this.l.as(a, c);
-        c.d = this.g;
-        c.h = this.i;
+        this.h.as(a, c);
+        c.i = this.r;
+        c.m = this.t;
         c.v = this.u;
         c.eu = -1;
-        c.s = 1;
+        c.e = 1;
         if (this.u != null) {
             c.v = this.u;
         }
@@ -1999,11 +2036,11 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         c.kv = d;
         c.ec = 0;
         c.appendButtonContent(b);
-        c.s5 = this.dp;
-        c.s1 = this.dj;
-        c.sv = this.df;
-        c.s0 = this.di;
-        c.s2 = this.dk;
+        c.s5 = this.dq;
+        c.s1 = this.dk;
+        c.sv = this.dg;
+        c.s0 = this.dj;
+        c.s2 = this.dl;
         c.bh = 40;
         this.ak.add(c);
     };
@@ -2066,12 +2103,12 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XCalendar.prototype.cn = function (a, b, c) {
         var d = new XButton();
-        this.l.as(a, d);
-        d.d = this.g;
-        d.h = this.i;
+        this.h.as(a, d);
+        d.i = this.r;
+        d.m = this.t;
         d.v = this.u;
         d.eu = -1;
-        d.s = 1;
+        d.e = 1;
         if (this.u != null) {
             d.v = this.u;
         }
@@ -2080,11 +2117,11 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         d.kv = e;
         d.ec = 0;
         d.appendButtonContent(b);
-        d.s5 = this.dp;
-        d.s1 = this.dj;
-        d.sv = this.df;
-        d.s0 = this.di;
-        d.s2 = this.dk;
+        d.s5 = this.dq;
+        d.s1 = this.dk;
+        d.sv = this.dg;
+        d.s0 = this.dj;
+        d.s2 = this.dl;
         d.ih = "btnYear" + c.toString();
         this.al.add(d);
     };
@@ -2094,7 +2131,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this.ai.clear();
         var a = dateAddDays(this.aq, -(this.aq.getDate() - 1));
-        var b = this.p;
+        var b = this.l;
         var c = a.getDay();
         while (c != b) {
             a = dateAddDays(a, -1);
@@ -2121,17 +2158,17 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         var c = dateFromValues(this.aq.getFullYear(), dateGetMonth(this.aq), 1, 0, 0, 0, 0);
         for (var d = 0; d < 6; d++) {
             var e = 0;
-            if (this.s == 2) {
-                e = this.ba(c, this.s, this.p);
+            if (this.o == 2) {
+                e = this.ba(c, this.o, this.l);
             }
             else {
-                e = this.ba(c, this.s, this.p);
+                e = this.ba(c, this.o, this.l);
             }
-            if (this.s == 0 || this.s == 2) {
+            if (this.o == 0 || this.o == 2) {
                 if (e == 2 && a._inner[d - 1] == 53) {
                     var f = c;
                     for (var g = 0; g < 6; g++) {
-                        if (f.getDay() == this.p) {
+                        if (f.getDay() == this.l) {
                             if (f.getDate() > 1) {
                                 a._inner[d - 1] = 1;
                             }
@@ -2139,10 +2176,10 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                                 e = 1;
                             }
                         }
-                        else if (f.getDay() < this.p) {
+                        else if (f.getDay() < this.l) {
                             f = dateAddDays(f, 1);
                         }
-                        else if (f.getDay() > this.p) {
+                        else if (f.getDay() > this.l) {
                             f = dateAddDays(f, -1);
                         }
                     }
@@ -2211,7 +2248,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XCalendar.prototype.bc = function (a, b) {
         var c = this.a7(this.au) - 1;
-        var d = this.q(this.au) - c % 7;
+        var d = this.m(this.au) - c % 7;
         var e = (a + 7 - d) % 7;
         if (e == 0 || e >= b) {
             return 1;
@@ -2228,7 +2265,7 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     XCalendar.prototype.a7 = function (a) {
         return this.a6(a, 1);
     };
-    XCalendar.prototype.q = function (a) {
+    XCalendar.prototype.m = function (a) {
         return ((intDivide(a.getTime(), 0xC92A69C000) + 1) % 7);
     };
     XCalendar.prototype.a6 = function (a, b) {
@@ -2281,18 +2318,18 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XCalendar.prototype.ck = function (a, b, c, d) {
         var e = new XButton();
-        this.l.as(a, e);
-        e.d = this.g;
-        e.h = this.i;
+        this.h.as(a, e);
+        e.i = this.r;
+        e.m = this.t;
         e.v = this.u;
         e.eu = -1;
-        e.s = 1;
+        e.e = 1;
         var f = new CornerRadius(0, 2);
         e.ke = f;
         e.kv = f;
         e.ec = 0;
         var g = new XIcon();
-        this.l.aw(b, g);
+        this.h.aw(b, g);
         if (d == "prev") {
             g.svgPath = XCalendar.bk;
             e.ih = "btnPrev";
@@ -2302,23 +2339,23 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
             e.ih = "btnNext";
         }
         e.appendButtonContent(c);
-        e.s5 = this.dp;
-        e.s1 = this.dj;
-        e.sv = this.df;
-        e.s0 = this.di;
-        e.s2 = this.dk;
+        e.s5 = this.dq;
+        e.s1 = this.dk;
+        e.sv = this.dg;
+        e.s0 = this.dj;
+        e.s2 = this.dl;
         e.bh = 28;
         e.bg = 28;
         this.aj.add(e);
     };
     XCalendar.prototype.cj = function (a, b, c) {
         var d = new XButton();
-        this.l.as(a, d);
-        d.d = this.g;
-        d.h = this.i;
+        this.h.as(a, d);
+        d.i = this.r;
+        d.m = this.t;
         d.v = this.u;
         d.eu = -1;
-        d.s = 1;
+        d.e = 1;
         if (this.u != null) {
             d.v = this.u;
         }
@@ -2327,11 +2364,11 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         d.kv = e;
         d.ec = 0;
         d.appendButtonContent(b);
-        d.s5 = this.dp;
-        d.s1 = this.dj;
-        d.sv = this.df;
-        d.s0 = this.di;
-        d.s2 = this.dk;
+        d.s5 = this.dq;
+        d.s1 = this.dk;
+        d.sv = this.dg;
+        d.s0 = this.dj;
+        d.s2 = this.dl;
         d.bh = 40;
         if (c == "month") {
             d.ih = "btnMonth";
@@ -2490,41 +2527,41 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    XCalendar.prototype.n = function (a) {
+    XCalendar.prototype.j = function (a) {
         return this.ai._inner[a];
     };
     XCalendar.prototype.ad = function (a) {
         var b = this.ai._inner[a];
         var c = this.ah._inner[a];
-        if (+(this.aw) != +(dateMinValue()) && b.b == this.aw.getDate() && b.c == dateGetMonth(this.aw) && b.d == this.aw.getFullYear()) {
-            c.s5 = this.dm;
-            c.s1 = this.dm;
-            c.sv = this.dl;
-            c.s0 = this.dn;
-            c.sw = this.df;
+        if (+(this.value) != +(dateMinValue()) && b.b == this.value.getDate() && b.c == dateGetMonth(this.value) && b.d == this.value.getFullYear()) {
+            c.s5 = this.dn;
+            c.s1 = this.dn;
+            c.sv = this.dm;
+            c.s0 = this.dp;
+            c.sw = this.dg;
         }
         else if (b.b == this.av.getDate() && b.c == dateGetMonth(this.av) && b.d == this.av.getFullYear()) {
-            c.s5 = this.dh;
+            c.s5 = this.di;
             ;
-            c.s1 = this.dj;
-            c.sv = this.df;
-            c.s0 = this.di;
-            c.sw = this.dg;
+            c.s1 = this.dk;
+            c.sv = this.dg;
+            c.s0 = this.dj;
+            c.sw = this.dh;
             c.be = 1;
         }
         else if (b.a != 0 && b.a != 6 && b.c == dateGetMonth(this.aq)) {
-            c.s5 = this.dp;
-            c.s1 = this.dj;
-            c.sv = this.df;
-            c.s0 = this.di;
-            c.sw = this.df;
+            c.s5 = this.dq;
+            c.s1 = this.dk;
+            c.sv = this.dg;
+            c.s0 = this.dj;
+            c.sw = this.dg;
         }
         else {
-            c.s5 = this.dp;
-            c.s1 = this.dj;
-            c.sv = this.df;
-            c.s0 = this.di;
-            c.sw = this.df;
+            c.s5 = this.dq;
+            c.s1 = this.dk;
+            c.sv = this.dg;
+            c.s0 = this.dj;
+            c.sw = this.dg;
         }
         if (b.d >= this.au.getFullYear() && b.d <= this.at.getFullYear()) {
             if (b.d == this.au.getFullYear() && b.d == this.at.getFullYear()) {
@@ -2731,35 +2768,35 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             a++;
         }
-        this.l.a4(a);
+        this.h.a5(a);
     };
     XCalendar.prototype.cy = function () {
-        this.l.aq();
+        this.h.ar();
     };
     XCalendar.prototype.bj = function () {
-        return this.j();
+        return this.f();
     };
     XCalendar.prototype.bs = function () {
-        var a = this.j();
+        var a = this.f();
         return a.o();
     };
-    XCalendar.prototype.j = function () {
+    XCalendar.prototype.f = function () {
         var a = new CalendarVisualModelExport();
-        a.i = this.i;
-        a.h = this.g;
-        a.e = AppearanceHelper.a(this.dl);
-        a.g = AppearanceHelper.a(this.dn);
-        a.c = AppearanceHelper.a(this.di);
-        a.f = AppearanceHelper.a(this.dm);
-        a.d = AppearanceHelper.a(this.dj);
-        a.b = AppearanceHelper.a(this.dh);
-        a.a = AppearanceHelper.a(this.dg);
+        a.i = this.t;
+        a.h = this.r;
+        a.e = AppearanceHelper.a(this.dm);
+        a.g = AppearanceHelper.a(this.dp);
+        a.c = AppearanceHelper.a(this.dj);
+        a.f = AppearanceHelper.a(this.dn);
+        a.d = AppearanceHelper.a(this.dk);
+        a.b = AppearanceHelper.a(this.di);
+        a.a = AppearanceHelper.a(this.dh);
         a.j = new List$1(ButtonVisualModelExport.$, 0);
         a.k = new List$1(TextElementsVisualModelExport.$, 0);
         a.l = new List$1(TextElementsVisualModelExport.$, 0);
-        var b = this.l.w();
+        var b = this.h.x();
         a.n = b;
-        var c = this.l.a();
+        var c = this.h.a();
         var d = c[0];
         var e = c[1];
         if (b == "day") {
@@ -2782,16 +2819,16 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                 a.j.add(i);
             }
             if (this.ae == true) {
-                this.k.ih = "todayButton";
-                var j = this.k.ey();
+                this.g.ih = "todayButton";
+                var j = this.g.ey();
                 j.s = j.s - d;
                 j.q = j.q - e;
                 a.j.add(j);
             }
-            var k = this.l.k();
+            var k = this.h.k();
             for (var l = 0; l < k.count; l++) {
                 var m = new TextElementsVisualModelExport();
-                var n = this.l.b(k._inner[l]);
+                var n = this.h.b(k._inner[l]);
                 m.e = n[0] - d;
                 m.d = n[1] - e;
                 m.c = NativeUI.c(k._inner[l].parent());
@@ -2801,10 +2838,10 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
                 a.k.add(m);
             }
             if (this.af == true) {
-                var o = this.l.l();
+                var o = this.h.l();
                 for (var p = 0; p < o.count; p++) {
                     var q = new TextElementsVisualModelExport();
-                    var r = this.l.b(o._inner[p]);
+                    var r = this.h.b(o._inner[p]);
                     q.e = r[0] - d;
                     q.d = r[1] - e;
                     q.c = NativeUI.c(o._inner[p].parent());
@@ -2840,8 +2877,8 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (this.v != null) {
             var w = this.v;
-            if (this.l != null && w.n == null) {
-                var x = this.l.m;
+            if (this.h != null && w.n == null) {
+                var x = this.h.m;
                 var y = FontUtil.getFontInfoFromString(x, w.fontString);
                 w.n = y.n;
                 w.d = y.d;
@@ -2876,4 +2913,3 @@ var XCalendar = /** @class */ /*@__PURE__*/ (function (_super) {
     return XCalendar;
 }(Base));
 export { XCalendar };
-//# sourceMappingURL=CalendarView_combined.js.map