igniteui-webcomponents-inputs 1.4.1 → 3.2.1

package/esm2015/lib/CalendarView_combined.js

@@ -19,7 +19,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";
@@ -39,9 +39,10 @@ export let CalendarView = /*@__PURE__*/ (() => {
             super();
             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);
@@ -50,10 +51,10 @@ export let CalendarView = /*@__PURE__*/ (() => {
             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;
         }
         k() {
@@ -62,9 +63,9 @@ export let CalendarView = /*@__PURE__*/ (() => {
         l() {
             return this.i;
         }
-        an() {
+        ao() {
         }
-        am(a) {
+        an(a) {
             if (a == null) {
                 this.m = null;
                 return;
@@ -73,18 +74,18 @@ export let CalendarView = /*@__PURE__*/ (() => {
             this.m.rootWrapper.setStyleProperty("background-color", "rgb(255, 255, 255)");
             let b = Math.round(a.rootWrapper.width());
             let c = Math.round(a.rootWrapper.height());
-            this.z();
-            this.a1();
+            this.aa();
             this.a2();
-            this.az();
+            this.a3();
+            this.a0();
             let 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));
         }
-        w() {
-            return this.v;
+        x() {
+            return this.w;
         }
-        z() {
+        aa() {
             if (this.m != null) {
                 this.n = this.m.createElement("div");
                 this.n.setStyleProperty("display", "flex");
@@ -93,16 +94,16 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 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 (let a = 0; a < 42; a++) {
                     let 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);
@@ -110,34 +111,34 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     let d = this.m.createElement("div");
                     this.h.add(d);
                 }
-                this.ab();
+                this.ac();
                 for (let e = 0; e < 12; e++) {
                     let 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 (let g = 0; g < 7; g++) {
                     let h = this.m.createElement("div");
                     this.j.add(h);
                 }
-                this.ad();
+                this.ae();
                 for (let i = 0; i < 7; i++) {
-                    let j = this.t.getChildAt(i);
-                    j.listen("click", runOn(this, this.ba));
+                    let 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();
             }
         }
-        ac() {
+        ad() {
             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%");
                 let a = this.c.ag();
                 for (let b = 0; b < 6; b++) {
                     let c = this.m.createElement("div");
@@ -151,43 +152,43 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     c.setStyleProperty("border-color", "rgb(163, 172, 184)");
                     let 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);
                 }
             }
         }
-        a3() {
-            if (this.s != null) {
+        a4() {
+            if (this.t != null) {
                 let a = this.c.ag();
                 this.i.clear();
                 for (let b = 0; b < 6; b++) {
-                    let c = this.s.getChildAt(b);
+                    let c = this.t.getChildAt(b);
                     let d = c.getChildAt(0);
                     d.setText(a._inner[b].toString());
                     this.i.add(d);
                 }
             }
         }
-        a7() {
-            if (this.s != null) {
+        a8() {
+            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%");
                 }
             }
         }
-        aa() {
+        ab() {
             if (this.m != null) {
                 this.o.setStyleProperty("display", "flex");
                 this.o.setStyleProperty("flex-direction", "column");
@@ -216,8 +217,8 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 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);
                 let g = this.m.createElement("div");
                 g.setStyleProperty("display", "flex");
                 g.setStyleProperty("flex-direction", "column");
@@ -241,7 +242,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             l.setStyleProperty("vertical-align", "middle");
                             l.setStyleProperty("width", "12%");
                             let 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);
@@ -258,7 +259,9 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             let 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);
@@ -267,31 +270,31 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         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");
                 let r = this.m.createElement("div");
                 r.setStyleProperty("width", "100%");
                 r.setStyleProperty("justify-content", "center");
-                let s = this.m.createElement("div");
+                this.r = this.m.createElement("div");
+                this.r.setAttribute("aria-hidden", "true");
+                let s = this.m.createElement("span");
                 s.setAttribute("aria-hidden", "true");
-                let 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();
             }
         }
-        ab() {
+        ac() {
             if (this.m != null) {
                 this.q.setStyleProperty("display", "flex");
                 this.q.setStyleProperty("flex-direction", "row");
@@ -327,19 +330,29 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     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);
                 }
             }
         }
-        ad() {
+        bc() {
+            for (let a = 0; a < 12; a++) {
+                let b = this.h._inner[a];
+                let c;
+                let d = a + 1;
+                c = this.c.e(d, a);
+                b.parent().parent().setAttribute("aria-label", c[0]);
+                let e = b.getChildAt(0);
+                e.setText(c[1]);
+            }
+        }
+        ae() {
             if (this.m != null) {
-                this.t.setStyleProperty("width", "100%");
-                this.t.setStyleProperty("height", "100%");
+                this.u.setStyleProperty("width", "100%");
+                this.u.setStyleProperty("height", "100%");
                 let 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 (let b = 0; b < 7; b++) {
                     let c = this.m.createElement("div");
                     let d = this.j._inner[b];
@@ -362,21 +375,21 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     a++;
                     d.setAttribute("data-index", b.toString());
                     d.append(f);
-                    this.t.append(c);
+                    this.u.append(c);
                 }
             }
         }
-        a6() {
+        a7() {
             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");
                 }
             }
         }
-        a1() {
+        a2() {
             if (this.m != null) {
                 let a = this.o.getChildAt(0);
                 for (let b = 0; b < 4; b++) {
@@ -390,6 +403,8 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 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);
                 let g = a.getChildAt(1);
@@ -402,6 +417,9 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 let 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);
                 let k = a.getChildAt(2);
@@ -414,6 +432,9 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 let 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);
                 let o = a.getChildAt(3);
@@ -423,6 +444,8 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 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);
                 let r = this.c.a();
@@ -434,12 +457,18 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         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));
             }
         }
+        bb() {
+            let a = this.g._inner[1];
+            let b = a.getChildAt(0);
+            let c = this.c.bx();
+            b.setText(c);
+        }
         av(a) {
             a.setAttribute("aria-hidden", "true");
             a.parent().setAttribute("aria-hidden", "true");
@@ -451,11 +480,11 @@ export let CalendarView = /*@__PURE__*/ (() => {
             a.setAttribute("data-section", "header");
             a.setAttribute("data-disabled", "false");
         }
-        a2() {
+        a3() {
             if (this.m != null) {
                 let a = this.o.getChildAt(1).getChildAt(1).getChildAt(0);
                 let b = new List$1(DayOfWeek_$type, 0);
-                switch (this.c.p) {
+                switch (this.c.l) {
                     case 0:
                         b.add(0);
                         b.add(1);
@@ -532,33 +561,33 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 }
             }
         }
-        az() {
+        a0() {
             if (this.m != null) {
-                this.a0();
-                this.a3();
+                this.a1();
+                this.a4();
                 let a = this.o.getChildAt(1);
                 let b = a.getChildAt(1);
                 for (let c = 1; c < 7; c++) {
                     let d = b.getChildAt(c);
                     for (let e = 0; e < 7; e++) {
                         let f = d.getChildAt(e);
-                        f.listen("click", runOn(this, this.af));
+                        f.listen("click", runOn(this, this.ag));
                     }
                 }
             }
         }
-        a0(a = false, b = false) {
+        a1(a = false, b = false) {
             if (this.m != null) {
                 let c = null;
                 let d = null;
                 let e = null;
-                let f = this.c.aw;
+                let f = this.c.value;
                 let g = this.c.aq;
                 let h = this.c.av;
                 for (let i = 0; i < 42; i++) {
                     let j = this.f._inner[i];
                     let k = j.getChildAt(0);
-                    let l = this.c.n(i);
+                    let 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");
@@ -596,7 +625,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     else if (e != null) {
                         if (b == true) {
                             for (let n = 41; n >= 0; n--) {
-                                let o = this.c.n(n);
+                                let o = this.c.j(n);
                                 if (o.c == dateGetMonth(g)) {
                                     let p = this.f._inner[n];
                                     let q = p.getAttribute("data-disabled");
@@ -609,7 +638,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         }
                         else {
                             for (let r = 0; r < 42; r++) {
-                                let s = this.c.n(r);
+                                let s = this.c.j(r);
                                 if (s.c == dateGetMonth(g)) {
                                     let t = this.f._inner[r];
                                     let u = t.getAttribute("data-disabled");
@@ -625,7 +654,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 }
             }
         }
-        ae(a, b, c) {
+        af(a, b, c) {
             if (this.m != null) {
                 b.setAttribute("aria-hidden", "true");
                 let d = this.m.createElement("span");
@@ -647,10 +676,10 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 let d = c.getExternal(b, c.rootWrapper, c.getExternal(this.c, null, null));
             }
         }
-        ar(a, b) {
-            let c = a.getChildAt(0);
-            c.setText(b);
-            a.parent().parent().setAttribute("aria-label", b);
+        az(a) {
+            let b = this.r.getChildAt(0);
+            b.setText(a);
+            this.r.parent().parent().setAttribute("aria-label", a);
         }
         aw(a, b) {
             if (this.m != null) {
@@ -671,8 +700,8 @@ export let CalendarView = /*@__PURE__*/ (() => {
         }
         at(a = false, b = false) {
             if (this.m != null) {
-                this.a0(a, b);
-                this.a3();
+                this.a1(a, b);
+                this.a4();
                 let c = this.c.a();
                 for (let d = 0; d < this.g.count; d++) {
                     if (c[d] == true) {
@@ -698,7 +727,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         g.setAttribute("data-disabled", "false");
                         g.parent().parent().setAttribute("aria-selected", "false");
                         let h = f + 1;
-                        let i = this.c.aw;
+                        let i = this.c.value;
                         let j = this.c.av;
                         if (+i != +(dateMinValue()) && dateGetMonth(i) == h) {
                             b = g;
@@ -735,21 +764,21 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         this.d(this.h._inner[e]);
                     }
                     else {
-                        this.aq();
+                        this.ar();
                     }
                 }
             }
         }
-        a5() {
+        a6() {
             if (this.m != null) {
                 if (this.j.count != 0) {
                     let a = this.c.aq.getFullYear();
                     let b = true;
-                    this.a4(a, b);
+                    this.a5(a, b);
                 }
             }
         }
-        a4(a, b = false) {
+        a5(a, b = false) {
             if (a < this.c.au.getFullYear()) {
                 a = this.c.au.getFullYear();
             }
@@ -785,16 +814,16 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 }
             }
         }
-        aq(a = false) {
+        ar(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();
         }
         au(a = false) {
             let b = null;
@@ -848,12 +877,12 @@ export let CalendarView = /*@__PURE__*/ (() => {
             this.p = a;
             return true;
         }
-        ag() {
+        ah() {
             if (this.p != null) {
                 this.p.parent().parent().focus(false);
             }
         }
-        ap(a = true, b = false) {
+        aq(a = true, b = false) {
             let c = parseBool(this.g._inner[0].getAttribute("data-disabled").toString());
             if (c) {
                 return;
@@ -862,7 +891,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
             this.at(a, b);
             this.ay();
         }
-        ak(a = true, b = false) {
+        al(a = true, b = false) {
             let c = parseBool(this.g._inner[3].getAttribute("data-disabled").toString());
             if (c) {
                 return;
@@ -871,28 +900,28 @@ export let CalendarView = /*@__PURE__*/ (() => {
             this.at(a, b);
             this.ay();
         }
-        a8() {
+        a9() {
             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();
         }
-        a9() {
+        ba() {
             this.n.hide();
             this.q.hide();
-            this.t.show();
-            this.v = "year";
-            this.a5();
-            this.ag();
-        }
-        x(a) {
+            this.u.show();
+            this.w = "year";
+            this.a6();
+            this.ah();
         }
         y(a) {
+        }
+        z(a) {
             let b = a.which;
-            if (this.v == "day") {
+            if (this.w == "day") {
                 let c = this.p.getAttribute("data-section").toString();
                 let d = parseInt(this.p.getAttribute("data-index").toString());
                 if (c == "header") {
@@ -904,14 +933,14 @@ export let CalendarView = /*@__PURE__*/ (() => {
                                 e = this.g._inner[d - 2];
                                 this.d(e);
                             }
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ap(false);
+                            this.aq(false);
                             let g = parseBool(this.p.getAttribute("data-disabled").toString());
                             if (g == true) {
                                 this.au();
-                                this.ag();
+                                this.ah();
                             }
                         }
                     }
@@ -923,14 +952,14 @@ export let CalendarView = /*@__PURE__*/ (() => {
                                 h = this.g._inner[d + 2];
                                 this.d(h);
                             }
-                            this.ag();
+                            this.ah();
                         }
                         else {
-                            this.ak(false);
+                            this.al(false);
                             let j = parseBool(this.p.getAttribute("data-disabled").toString());
                             if (j == true) {
                                 this.au();
-                                this.ag();
+                                this.ah();
                             }
                         }
                     }
@@ -941,22 +970,22 @@ export let CalendarView = /*@__PURE__*/ (() => {
                         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);
                         }
                     }
                 }
@@ -966,8 +995,8 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     let m = k[1];
                     if (b == 37) {
                         if (d == 0) {
-                            this.ap(true, true);
-                            this.ag();
+                            this.aq(true, true);
+                            this.ah();
                         }
                         else {
                             let n = this.f._inner[d - 1];
@@ -976,20 +1005,20 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             let q = o[1];
                             if (m == q) {
                                 this.d(n);
-                                this.ag();
+                                this.ah();
                             }
                             else {
-                                this.ap();
-                                let r = this.u(p, q);
+                                this.aq();
+                                let 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 {
                             let s = this.f._inner[d + 1];
@@ -998,28 +1027,28 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             let v = t[1];
                             if (m == v) {
                                 this.d(s);
-                                this.ag();
+                                this.ah();
                             }
                             else {
-                                this.ak();
-                                let w = this.u(u, v);
+                                this.al();
+                                let w = this.v(u, v);
                                 this.d(w);
-                                this.ag();
+                                this.ah();
                             }
                         }
                     }
                     else if (b == 40) {
                         if (d >= 35) {
-                            this.ak();
-                            let x = this.u(l, m);
+                            this.al();
+                            let x = this.v(l, m);
                             let y = parseInt(x.getAttribute("data-index").toString());
                             let z = this.f._inner[y + 7];
                             let aa = z.getAttribute("data-date").toString().split('/');
                             let ab = aa[0];
                             let ac = aa[1];
-                            let ad = this.u(ab, ac);
+                            let ad = this.v(ab, ac);
                             this.d(ad);
-                            this.ag();
+                            this.ah();
                         }
                         else {
                             let ae = this.f._inner[d + 7];
@@ -1028,28 +1057,28 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             let ah = af[1];
                             if (m == ah) {
                                 this.d(ae);
-                                this.ag();
+                                this.ah();
                             }
                             else {
-                                this.ak();
-                                let ai = this.u(ag, ah);
+                                this.al();
+                                let ai = this.v(ag, ah);
                                 this.d(ai);
-                                this.ag();
+                                this.ah();
                             }
                         }
                     }
                     else if (b == 38) {
                         if (d <= 6) {
-                            this.ap();
-                            let aj = this.u(l, m);
+                            this.aq();
+                            let aj = this.v(l, m);
                             let ak = parseInt(aj.getAttribute("data-index").toString());
                             let al = this.f._inner[ak - 7];
                             let am = al.getAttribute("data-date").toString().split('/');
                             let an = am[0];
                             let ao = am[1];
-                            let ap = this.u(an, ao);
+                            let ap = this.v(an, ao);
                             this.d(ap);
-                            this.ag();
+                            this.ah();
                         }
                         else {
                             let aq = this.f._inner[d - 7];
@@ -1058,30 +1087,30 @@ export let CalendarView = /*@__PURE__*/ (() => {
                             let at = ar[1];
                             if (m == at) {
                                 this.d(aq);
-                                this.ag();
+                                this.ah();
                             }
                             else {
-                                this.ap();
-                                let au = this.u(as, at);
+                                this.aq();
+                                let 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();
                             let av = this.g._inner[1];
                             this.d(av);
-                            this.ag();
+                            this.ah();
                         }
                         else {
                             this.c.cs();
@@ -1089,89 +1118,89 @@ export let CalendarView = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            else if (this.v == "month") {
+            else if (this.w == "month") {
                 let aw = parseInt(this.p.getAttribute("data-index").toString());
                 if (b == 37) {
                     if (aw == 0) {
                         let ax = this.h._inner[11];
                         this.d(ax);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         let ay = this.h._inner[aw - 1];
                         this.d(ay);
-                        this.ag();
+                        this.ah();
                     }
                 }
                 else if (b == 39) {
                     if (aw == 11) {
                         let az = this.h._inner[0];
                         this.d(az);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         let a0 = this.h._inner[aw + 1];
                         this.d(a0);
-                        this.ag();
+                        this.ah();
                     }
                 }
                 else if (b == 40) {
                     if (aw >= 9) {
                         let a1 = this.h._inner[aw - 9];
                         this.d(a1);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         let a2 = this.h._inner[aw + 3];
                         this.d(a2);
-                        this.ag();
+                        this.ah();
                     }
                 }
                 else if (b == 38) {
                     if (aw <= 2) {
                         let a3 = this.h._inner[aw + 9];
                         this.d(a3);
-                        this.ag();
+                        this.ah();
                     }
                     else {
                         let 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") {
                 let a5 = parseInt(this.p.getAttribute("data-index").toString());
                 let 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();
                 }
             }
         }
-        u(a, b) {
+        v(a, b) {
             let c = null;
             let d = null;
             for (let e = 0; e < 42; e++) {
@@ -1192,39 +1221,39 @@ export let CalendarView = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        ao(a) {
+        ap(a) {
             let b = this.g._inner[0];
             let c = parseBool(b.getAttribute("data-disabled").toString());
             if (c == true) {
                 return;
             }
-            this.ap();
+            this.aq();
         }
-        aj(a) {
+        ak(a) {
             let b = this.g._inner[3];
             let c = parseBool(b.getAttribute("data-disabled").toString());
             if (c == true) {
                 return;
             }
-            this.ak();
+            this.al();
         }
-        ai(a) {
+        aj(a) {
             let b = this.g._inner[1];
             let c = parseBool(b.getAttribute("data-disabled").toString());
             if (c == true) {
                 return;
             }
-            this.a8();
+            this.a9();
         }
-        bc(a) {
+        bf(a) {
             let b = this.g._inner[2];
             let c = parseBool(b.getAttribute("data-disabled").toString());
             if (c == true) {
                 return;
             }
-            this.a9();
+            this.ba();
         }
-        af(e_) {
+        ag(e_) {
             let a = (e_.originalEvent.currentTarget);
             let b = a.innerText;
             if (b != "") {
@@ -1238,7 +1267,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 }
             }
         }
-        ah(e_) {
+        ai(e_) {
             let a = (e_.originalEvent.currentTarget);
             let b = a.getAttribute("data-month").toString();
             if (b != "") {
@@ -1247,11 +1276,11 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 let e = parseBool(d.getAttribute("data-disabled").toString());
                 if (e == false) {
                     this.c.cd(c);
-                    this.aq();
+                    this.ar();
                 }
             }
         }
-        ba(e_) {
+        bd(e_) {
             let a = (e_.originalEvent.currentTarget);
             let b = a.innerText;
             if (b != "") {
@@ -1260,11 +1289,11 @@ export let CalendarView = /*@__PURE__*/ (() => {
                 let e = parseBool(d.getAttribute("data-disabled").toString());
                 if (e == false) {
                     this.c.ce(c);
-                    this.aq();
+                    this.ar();
                 }
             }
         }
-        bb(e_) {
+        be(e_) {
             e_.preventDefault();
             let a = (e_.originalEvent.deltaY);
             let b = parseInt(this.j._inner[3].getChildAt(0).getText());
@@ -1288,7 +1317,7 @@ export let CalendarView = /*@__PURE__*/ (() => {
             d[1] = c;
             return d;
         }
-        al() {
+        am() {
         }
     }
     CalendarView.$t = /*@__PURE__*/ markType(CalendarView, 'CalendarView');
@@ -1301,7 +1330,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
     class XCalendar extends Base {
         constructor() {
             super();
-            this.l = null;
+            this.h = null;
             this.aq = dateNow();
             this.am = new Date();
             this.ai = null;
@@ -1309,32 +1338,32 @@ export let XCalendar = /*@__PURE__*/ (() => {
             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);
@@ -1344,8 +1373,8 @@ export let XCalendar = /*@__PURE__*/ (() => {
             this.al = new ObservableCollection$1(XButton.$, 0);
             let a = new CalendarView();
             a.c = this;
-            this.l = a;
-            this.l.an();
+            this.h = a;
+            this.h.ao();
         }
         cs() {
             if (this.close != null) {
@@ -1355,16 +1384,16 @@ export let XCalendar = /*@__PURE__*/ (() => {
         cu(a) {
             let b = this.as;
             this.as = a;
-            if (this.valueChanged != null) {
-                this.valueChanged(this, ((() => {
-                    let $ret = new ValueChangedEventArgs();
+            if (this.selectedValueChanged != null) {
+                this.selectedValueChanged(this, ((() => {
+                    let $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();
         }
@@ -1373,29 +1402,29 @@ export let XCalendar = /*@__PURE__*/ (() => {
             this.cu(d);
         }
         notifySizeChanged() {
-            this.l.al();
+            this.h.am();
         }
         destroy() {
-            if (this.k != null) {
-                let a = this.k;
+            if (this.g != null) {
+                let a = this.g;
                 a.clicked = delegateRemove(a.clicked, runOn(this, this.c2));
             }
             this.provideContainer(null);
         }
         provideContainer(a) {
-            this.l.am(a);
+            this.h.an(a);
         }
         get x() {
             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;
         }
-        get aw() {
+        get value() {
             return this.as;
         }
-        set aw(a) {
+        set value(a) {
             let b = this.as;
             this.ap = b;
             this.as = a;
@@ -1433,34 +1462,64 @@ export let XCalendar = /*@__PURE__*/ (() => {
                 this.ct("MaxDate", b, this.an);
             }
         }
-        get i() {
-            return this.h;
+        get t() {
+            return this.s;
         }
-        set i(a) {
-            let b = this.h;
-            this.h = a;
-            if (b != this.h) {
-                this.ct("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, this.h));
+        set t(a) {
+            let b = this.s;
+            this.s = a;
+            if (b != this.s) {
+                this.ct("Density", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, this.s));
+            }
+        }
+        get r() {
+            return this.q;
+        }
+        set r(a) {
+            let b = this.q;
+            this.q = a;
+            if (b != this.q) {
+                this.ct("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, this.q));
+            }
+        }
+        get dg() {
+            return this.c6;
+        }
+        set dg(a) {
+            let b = this.c6;
+            this.c6 = a;
+            if (b != this.c6) {
+                this.ct("BackgroundColor", b, this.c6);
+            }
+        }
+        get dm() {
+            return this.dc;
+        }
+        set dm(a) {
+            let b = this.dc;
+            this.dc = a;
+            if (b != this.dc) {
+                this.ct("SelectedDateBackgroundColor", b, this.dc);
             }
         }
-        get g() {
-            return this.f;
+        get dp() {
+            return this.de;
         }
-        set g(a) {
-            let b = this.f;
-            this.f = a;
-            if (b != this.f) {
-                this.ct("BaseTheme", enumGetBox(BaseControlTheme_$type, b), enumGetBox(BaseControlTheme_$type, this.f));
+        set dp(a) {
+            let b = this.de;
+            this.de = a;
+            if (b != this.de) {
+                this.ct("SelectedFocusDateBackgroundColor", b, this.de);
             }
         }
-        get df() {
-            return this.c5;
+        get dj() {
+            return this.c9;
         }
-        set df(a) {
-            let b = this.c5;
-            this.c5 = a;
-            if (b != this.c5) {
-                this.ct("BackgroundColor", b, this.c5);
+        set dj(a) {
+            let b = this.c9;
+            this.c9 = a;
+            if (b != this.c9) {
+                this.ct("FocusDateBackgroundColor", b, this.c9);
             }
         }
         get dl() {
@@ -1470,7 +1529,17 @@ export let XCalendar = /*@__PURE__*/ (() => {
             let b = this.db;
             this.db = a;
             if (b != this.db) {
-                this.ct("SelectedDateBackgroundColor", b, this.db);
+                this.ct("HoverBackgroundColor", b, this.db);
+            }
+        }
+        get dq() {
+            return this.df;
+        }
+        set dq(a) {
+            let b = this.df;
+            this.df = a;
+            if (b != this.df) {
+                this.ct("TextColor", b, this.df);
             }
         }
         get dn() {
@@ -1480,17 +1549,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
             let b = this.dd;
             this.dd = a;
             if (b != this.dd) {
-                this.ct("SelectedFocusDateBackgroundColor", b, this.dd);
-            }
-        }
-        get di() {
-            return this.c8;
-        }
-        set di(a) {
-            let b = this.c8;
-            this.c8 = a;
-            if (b != this.c8) {
-                this.ct("FocusDateBackgroundColor", b, this.c8);
+                this.ct("SelectedDateTextColor", b, this.dd);
             }
         }
         get dk() {
@@ -1500,37 +1559,17 @@ export let XCalendar = /*@__PURE__*/ (() => {
             let b = this.da;
             this.da = a;
             if (b != this.da) {
-                this.ct("HoverBackgroundColor", b, this.da);
-            }
-        }
-        get dp() {
-            return this.de;
-        }
-        set dp(a) {
-            let b = this.de;
-            this.de = a;
-            if (b != this.de) {
-                this.ct("TextColor", b, this.de);
+                this.ct("FocusDateTextColor", b, this.da);
             }
         }
-        get dm() {
-            return this.dc;
-        }
-        set dm(a) {
-            let b = this.dc;
-            this.dc = a;
-            if (b != this.dc) {
-                this.ct("SelectedDateTextColor", b, this.dc);
-            }
-        }
-        get dj() {
-            return this.c9;
+        get di() {
+            return this.c8;
         }
-        set dj(a) {
-            let b = this.c9;
-            this.c9 = a;
-            if (b != this.c9) {
-                this.ct("FocusDateTextColor", b, this.c9);
+        set di(a) {
+            let b = this.c8;
+            this.c8 = a;
+            if (b != this.c8) {
+                this.ct("CurrentDateTextColor", b, this.c8);
             }
         }
         get dh() {
@@ -1540,17 +1579,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
             let b = this.c7;
             this.c7 = a;
             if (b != this.c7) {
-                this.ct("CurrentDateTextColor", b, this.c7);
-            }
-        }
-        get dg() {
-            return this.c6;
-        }
-        set dg(a) {
-            let b = this.c6;
-            this.c6 = a;
-            if (b != this.c6) {
-                this.ct("CurrentDateBorderColor", b, this.c6);
+                this.ct("CurrentDateBorderColor", b, this.c7);
             }
         }
         get ae() {
@@ -1573,24 +1602,24 @@ export let XCalendar = /*@__PURE__*/ (() => {
                 this.ct("TextStyle", b, this.u);
             }
         }
-        get p() {
-            return this.o;
+        get l() {
+            return this.k;
         }
-        set p(a) {
-            let b = this.o;
-            this.o = a;
-            if (b != this.o) {
-                this.ct("FirstDayOfWeek", enumGetBox(DayOfWeek_$type, b), enumGetBox(DayOfWeek_$type, this.o));
+        set l(a) {
+            let b = this.k;
+            this.k = a;
+            if (b != this.k) {
+                this.ct("FirstDayOfWeek", enumGetBox(DayOfWeek_$type, b), enumGetBox(DayOfWeek_$type, this.k));
             }
         }
-        get s() {
-            return this.r;
+        get o() {
+            return this.n;
         }
-        set s(a) {
-            let b = this.r;
-            this.r = a;
-            if (b != this.r) {
-                this.ct("FirstWeekOfYear", enumGetBox(FirstWeek_$type, b), enumGetBox(FirstWeek_$type, this.r));
+        set o(a) {
+            let b = this.n;
+            this.n = a;
+            if (b != this.n) {
+                this.ct("FirstWeekOfYear", enumGetBox(FirstWeek_$type, b), enumGetBox(FirstWeek_$type, this.n));
             }
         }
         get af() {
@@ -1618,14 +1647,14 @@ export let XCalendar = /*@__PURE__*/ (() => {
                     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;
@@ -1638,7 +1667,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
                     else if (e > 0) {
                         this.ar = this.at;
                     }
-                    if (+(this.aw) == +(dateMinValue())) {
+                    if (+(this.value) == +(dateMinValue())) {
                         this.aq = this.av;
                     }
                     this.cx();
@@ -1675,85 +1704,85 @@ export let XCalendar = /*@__PURE__*/ (() => {
                     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;
             }
         }
         c3() {
             for (let 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 (let 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 (let 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 (let 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;
                 }
             }
         }
@@ -1780,35 +1809,43 @@ export let XCalendar = /*@__PURE__*/ (() => {
             }
         }
         cq() {
-            this.l.au();
-            this.l.ag();
+            this.cx();
+            this.h.au();
+            this.h.ah();
         }
         c1() {
         }
         c0() {
         }
         ch() {
-            this.aw = dateMinValue();
-            this.l.at();
+            this.value = dateMinValue();
+            this.h.at();
         }
         cx() {
-            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();
+        }
+        c5() {
+            let a = !stringIsNullOrWhiteSpace(this.x.b1("Today")) ? this.x.b1("Today") : "Today";
+            this.h.az(a);
+            this.h.bc();
+            this.h.bb();
         }
         cf() {
             this.cg();
         }
         ci(a, b, c) {
             let 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;
             }
@@ -1817,11 +1854,11 @@ export let XCalendar = /*@__PURE__*/ (() => {
             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);
@@ -1829,12 +1866,12 @@ export let XCalendar = /*@__PURE__*/ (() => {
         }
         cm(a, b) {
             let 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;
             }
@@ -1844,29 +1881,29 @@ export let XCalendar = /*@__PURE__*/ (() => {
             c.ec = 0;
             c.appendButtonContent(b);
             let 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;
-            let 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;
+            let f = this.g;
             f.clicked = delegateCombine(f.clicked, runOn(this, this.c2));
         }
         c2(a, b) {
             this.aq = this.av;
             this.cg();
-            this.l.aq(true);
+            this.h.ar(true);
         }
         cl(a, b) {
             let 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;
             }
@@ -1875,11 +1912,11 @@ export let XCalendar = /*@__PURE__*/ (() => {
             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);
         }
@@ -1942,12 +1979,12 @@ export let XCalendar = /*@__PURE__*/ (() => {
         }
         cn(a, b, c) {
             let 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;
             }
@@ -1956,11 +1993,11 @@ export let XCalendar = /*@__PURE__*/ (() => {
             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);
         }
@@ -1970,7 +2007,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
             }
             this.ai.clear();
             let a = dateAddDays(this.aq, -(this.aq.getDate() - 1));
-            let b = this.p;
+            let b = this.l;
             let c = a.getDay();
             while (c != b) {
                 a = dateAddDays(a, -1);
@@ -1997,17 +2034,17 @@ export let XCalendar = /*@__PURE__*/ (() => {
             let c = dateFromValues(this.aq.getFullYear(), dateGetMonth(this.aq), 1, 0, 0, 0, 0);
             for (let d = 0; d < 6; d++) {
                 let 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) {
                         let f = c;
                         for (let g = 0; g < 6; g++) {
-                            if (f.getDay() == this.p) {
+                            if (f.getDay() == this.l) {
                                 if (f.getDate() > 1) {
                                     a._inner[d - 1] = 1;
                                 }
@@ -2015,10 +2052,10 @@ export let XCalendar = /*@__PURE__*/ (() => {
                                     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);
                             }
                         }
@@ -2087,7 +2124,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
         }
         bc(a, b) {
             let c = this.a7(this.au) - 1;
-            let d = this.q(this.au) - c % 7;
+            let d = this.m(this.au) - c % 7;
             let e = (a + 7 - d) % 7;
             if (e == 0 || e >= b) {
                 return 1;
@@ -2104,7 +2141,7 @@ export let XCalendar = /*@__PURE__*/ (() => {
         a7(a) {
             return this.a6(a, 1);
         }
-        q(a) {
+        m(a) {
             return ((intDivide(a.getTime(), 0xC92A69C000) + 1) % 7);
         }
         a6(a, b) {
@@ -2157,18 +2194,18 @@ export let XCalendar = /*@__PURE__*/ (() => {
         }
         ck(a, b, c, d) {
             let 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;
             let f = new CornerRadius(0, 2);
             e.ke = f;
             e.kv = f;
             e.ec = 0;
             let g = new XIcon();
-            this.l.aw(b, g);
+            this.h.aw(b, g);
             if (d == "prev") {
                 g.svgPath = XCalendar.bk;
                 e.ih = "btnPrev";
@@ -2178,23 +2215,23 @@ export let XCalendar = /*@__PURE__*/ (() => {
                 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);
         }
         cj(a, b, c) {
             let 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;
             }
@@ -2203,11 +2240,11 @@ export let XCalendar = /*@__PURE__*/ (() => {
             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";
@@ -2366,41 +2403,41 @@ export let XCalendar = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        n(a) {
+        j(a) {
             return this.ai._inner[a];
         }
         ad(a) {
             let b = this.ai._inner[a];
             let 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()) {
@@ -2607,35 +2644,35 @@ export let XCalendar = /*@__PURE__*/ (() => {
             else {
                 a++;
             }
-            this.l.a4(a);
+            this.h.a5(a);
         }
         cy() {
-            this.l.aq();
+            this.h.ar();
         }
         bj() {
-            return this.j();
+            return this.f();
         }
         bs() {
-            let a = this.j();
+            let a = this.f();
             return a.o();
         }
-        j() {
+        f() {
             let 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);
-            let b = this.l.w();
+            let b = this.h.x();
             a.n = b;
-            let c = this.l.a();
+            let c = this.h.a();
             let d = c[0];
             let e = c[1];
             if (b == "day") {
@@ -2658,16 +2695,16 @@ export let XCalendar = /*@__PURE__*/ (() => {
                     a.j.add(i);
                 }
                 if (this.ae == true) {
-                    this.k.ih = "todayButton";
-                    let j = this.k.ey();
+                    this.g.ih = "todayButton";
+                    let j = this.g.ey();
                     j.s = j.s - d;
                     j.q = j.q - e;
                     a.j.add(j);
                 }
-                let k = this.l.k();
+                let k = this.h.k();
                 for (let l = 0; l < k.count; l++) {
                     let m = new TextElementsVisualModelExport();
-                    let n = this.l.b(k._inner[l]);
+                    let 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());
@@ -2677,10 +2714,10 @@ export let XCalendar = /*@__PURE__*/ (() => {
                     a.k.add(m);
                 }
                 if (this.af == true) {
-                    let o = this.l.l();
+                    let o = this.h.l();
                     for (let p = 0; p < o.count; p++) {
                         let q = new TextElementsVisualModelExport();
-                        let r = this.l.b(o._inner[p]);
+                        let 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());
@@ -2716,8 +2753,8 @@ export let XCalendar = /*@__PURE__*/ (() => {
             }
             if (this.v != null) {
                 let w = this.v;
-                if (this.l != null && w.n == null) {
-                    let x = this.l.m;
+                if (this.h != null && w.n == null) {
+                    let x = this.h.m;
                     let y = FontUtil.getFontInfoFromString(x, w.fontString);
                     w.n = y.n;
                     w.d = y.d;
@@ -2752,4 +2789,3 @@ export let XCalendar = /*@__PURE__*/ (() => {
     XCalendar.c = [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366];
     return XCalendar;
 })();
-//# sourceMappingURL=CalendarView_combined.js.map