@syncfusion/ej2-calendars 22.2.11 → 23.1.36

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 22.2.11
+*  version : 23.1.36
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-calendars@*",
-  "_id": "@syncfusion/ej2-calendars@22.2.10",
+  "_id": "@syncfusion/ej2-calendars@18.30.19",
   "_inBundle": false,
-  "_integrity": "sha512-Sr2NdC4t3rAxX5aYicbL866BCfVLTqsMOLLFFs+UfcMnuWoqV5J2JJSEwdxY/xk6IuMq9zVjiZ6Je7dOudoYVw==",
+  "_integrity": "sha512-5BGAVBB7bje1ac5Con6z38AcEVebQTlUxlPBskT+GbrPfw8RPSwlnsNOt0OCZEQuyiy5pXLgad6ka3LcaAzxoA==",
   "_location": "/@syncfusion/ej2-calendars",
   "_phantomChildren": {},
   "_requested": {
@@ -32,10 +32,10 @@
     "/@syncfusion/ej2-schedule",
     "/@syncfusion/ej2-vue-calendars"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-calendars/-/ej2-calendars-22.2.10.tgz",
-  "_shasum": "08c96663fb2f05e48b7a9499bd4c4bf629fb2c1a",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-calendars/-/ej2-calendars-18.30.19.tgz",
+  "_shasum": "6b657c36e2467ee9128c8449d1d803c369d60170",
   "_spec": "@syncfusion/ej2-calendars@*",
-  "_where": "/jenkins/workspace/elease-automation_release_21.1.1/packages/included",
+  "_where": "/jenkins/workspace/elease-automation_release_23.1.1/packages/included",
   "author": {
     "name": "Syncfusion Inc."
   },
@@ -44,11 +44,11 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~22.2.10",
-    "@syncfusion/ej2-buttons": "~22.2.9",
-    "@syncfusion/ej2-inputs": "~22.2.9",
-    "@syncfusion/ej2-lists": "~22.2.11",
-    "@syncfusion/ej2-popups": "~22.2.11"
+    "@syncfusion/ej2-base": "~23.1.36",
+    "@syncfusion/ej2-buttons": "~23.1.36",
+    "@syncfusion/ej2-inputs": "~23.1.36",
+    "@syncfusion/ej2-lists": "~23.1.36",
+    "@syncfusion/ej2-popups": "~23.1.36"
   },
   "deprecated": false,
   "description": "A complete package of date or time components with built-in features such as date formatting, inline editing, multiple (range) selection, range restriction, month and year selection, strict mode, and globalization.",
@@ -81,6 +81,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "22.2.11",
+  "version": "23.1.36",
   "sideEffects": false
 }

package/src/calendar/calendar.js

@@ -1473,6 +1473,7 @@ var CalendarBase = /** @class */ (function (_super) {
         }
         this.todayElement = null;
         this.tableBodyElement = null;
+        this.todayButtonEvent = null;
         this.renderDayCellArgs = null;
         this.headerElement = null;
         this.nextIcon = null;
@@ -2421,6 +2422,7 @@ var Calendar = /** @class */ (function (_super) {
     Calendar.prototype.destroy = function () {
         _super.prototype.destroy.call(this);
         if (this.getModuleName() === 'calendar') {
+            this.changedArgs = null;
             var form = closest(this.element, 'form');
             if (form) {
                 EventHandler.remove(form, 'reset', this.formResetHandler.bind(this));

package/src/datepicker/datepicker.d.ts

@@ -68,6 +68,7 @@ export declare class DatePicker extends Calendar implements IInput {
     protected touchStart: boolean;
     protected iconRight: boolean;
     protected isBlur: boolean;
+    private isKeyAction;
     /**
      * Specifies the width of the DatePicker component.
      *
@@ -448,6 +449,7 @@ export declare class DatePicker extends Calendar implements IInput {
     private modelCloseHandler;
     protected changeTrigger(event?: MouseEvent | KeyboardEvent): void;
     protected navigatedEvent(): void;
+    protected keyupHandler(e: KeyboardEventArgs): void;
     protected changeEvent(event?: MouseEvent | KeyboardEvent | Event): void;
     requiredModules(): ModuleDeclaration[];
     protected selectCalendar(e?: MouseEvent | KeyboardEvent | Event): void;

package/src/datepicker/datepicker.js

@@ -86,6 +86,7 @@ var DatePicker = /** @class */ (function (_super) {
         _this.moduleName = _this.getModuleName();
         _this.isFocused = false;
         _this.isBlur = false;
+        _this.isKeyAction = false;
         _this.datepickerOptions = options;
         return _this;
     }
@@ -416,6 +417,7 @@ var DatePicker = /** @class */ (function (_super) {
         EventHandler.add(this.inputElement, 'mouseup', this.mouseUpHandler, this);
         EventHandler.add(this.inputElement, 'focus', this.inputFocusHandler, this);
         EventHandler.add(this.inputElement, 'blur', this.inputBlurHandler, this);
+        EventHandler.add(this.inputElement, 'keyup', this.keyupHandler, this);
         if (this.enableMask) {
             EventHandler.add(this.inputElement, 'keydown', this.keydownHandler, this);
         }
@@ -466,6 +468,7 @@ var DatePicker = /** @class */ (function (_super) {
         EventHandler.remove(this.inputElement, 'focus', this.inputFocusHandler);
         EventHandler.remove(this.inputElement, 'blur', this.inputBlurHandler);
         EventHandler.remove(this.inputElement, 'change', this.inputChangeHandler);
+        EventHandler.remove(this.inputElement, 'keyup', this.keyupHandler);
         if (this.enableMask) {
             EventHandler.remove(this.inputElement, 'keydown', this.keydownHandler);
         }
@@ -1157,12 +1160,16 @@ var DatePicker = /** @class */ (function (_super) {
                 this.isInteracted = true;
             }
         }
+        this.isKeyAction = false;
     };
     DatePicker.prototype.navigatedEvent = function () {
         this.trigger('navigated', this.navigatedArgs);
     };
+    DatePicker.prototype.keyupHandler = function (e) {
+        this.isKeyAction = (this.inputElement.value !== this.previousElementValue) ? true : false;
+    };
     DatePicker.prototype.changeEvent = function (event) {
-        if (!this.isIconClicked && !this.isBlur) {
+        if (!this.isIconClicked && !(this.isBlur || this.isKeyAction)) {
             this.selectCalendar(event);
         }
         if (((this.previousDate && this.previousDate.valueOf()) !== (this.value && this.value.valueOf()))) {
@@ -1182,6 +1189,7 @@ var DatePicker = /** @class */ (function (_super) {
         else if (event) {
             this.hide(event);
         }
+        this.isKeyAction = false;
     };
     DatePicker.prototype.requiredModules = function () {
         var modules = [];

package/src/daterangepicker/daterangepicker.d.ts

@@ -173,6 +173,7 @@ export declare class DateRangePicker extends CalendarBase {
     protected touchRangeModule: Touch;
     protected touchRangeStart: boolean;
     protected iconRangeRight: string;
+    private isKeyPressed;
     /**
      * Gets or sets the start and end date of the Calendar.
      * {% codeBlock src='daterangepicker/value/index.md' %}{% endcodeBlock %}
@@ -715,6 +716,7 @@ export declare class DateRangePicker extends CalendarBase {
     private modelRangeCloseHandler;
     private cancelFunction;
     private deviceHeaderUpdate;
+    private keyupHandler;
     private applyFunction;
     private onMouseClick;
     private onMouseOver;

package/src/daterangepicker/daterangepicker.js

@@ -147,6 +147,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         _this.invalidValueString = null;
         _this.isAngular = false;
         _this.preventChange = false;
+        _this.isKeyPressed = false;
         _this.dateRangeOptions = options;
         return _this;
     }
@@ -502,6 +503,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         EventHandler.add(this.inputElement, 'focus', this.inputFocusHandler, this);
         EventHandler.add(this.inputElement, 'blur', this.inputBlurHandler, this);
         EventHandler.add(this.inputElement, 'change', this.inputChangeHandler, this);
+        EventHandler.add(this.inputElement, 'keyup', this.keyupHandler, this);
         if (this.showClearButton && this.inputWrapper.clearButton) {
             EventHandler.add(this.inputWrapper.clearButton, 'mousedown', this.resetHandler, this);
         }
@@ -528,6 +530,7 @@ var DateRangePicker = /** @class */ (function (_super) {
         EventHandler.remove(this.inputElement, 'blur', this.inputBlurHandler);
         EventHandler.remove(this.inputElement, 'focus', this.inputFocusHandler);
         EventHandler.remove(this.inputElement, 'change', this.inputChangeHandler);
+        EventHandler.remove(this.inputElement, 'keyup', this.keyupHandler);
         if (this.showClearButton && this.inputWrapper.clearButton) {
             EventHandler.remove(this.inputWrapper.clearButton, 'mousedown touchstart', this.resetHandler);
         }
@@ -676,7 +679,9 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.show(null, e);
             if (!this.isMobile) {
                 if (!isNullOrUndefined(this.leftCalendar)) {
+                    this.isRangeIconClicked = false;
                     this.calendarFocus();
+                    this.isRangeIconClicked = true;
                 }
             }
             addClass([this.inputWrapper.container], [INPUTFOCUS]);
@@ -1847,11 +1852,16 @@ var DateRangePicker = /** @class */ (function (_super) {
         if (event) {
             leftCalendar = closest(event.target, '.' + LEFTCALENDER);
         }
-        if (event && isNullOrUndefined(leftCalendar)) {
-            rightCalendar = event && closest(event.target, '.' + RIGHTCALENDER);
+        if (!isNullOrUndefined(leftCalendar)) {
+            this.leftCalendar.children[1].firstElementChild.focus();
         }
-        if (!isNullOrUndefined(leftCalendar) || !isNullOrUndefined(rightCalendar)) {
-            this.inputWrapper.container.focus();
+        else {
+            if (event) {
+                rightCalendar = event && closest(event.target, '.' + RIGHTCALENDER);
+            }
+            if (!isNullOrUndefined(rightCalendar)) {
+                this.rightCalendar.children[1].firstElementChild.focus();
+            }
         }
         addClass([ele], SELECTED);
         this.calendarIconEvent();
@@ -2753,6 +2763,9 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.startButton.element.classList.add(ACTIVE);
         }
     };
+    DateRangePicker.prototype.keyupHandler = function (e) {
+        this.isKeyPressed = (this.inputElement.value !== this.previousEleValue) ? true : false;
+    };
     DateRangePicker.prototype.applyFunction = function (eve) {
         var isValueChanged = false;
         if (eve.type !== 'touchstart') {
@@ -2778,7 +2791,10 @@ var DateRangePicker = /** @class */ (function (_super) {
             this.previousStartValue = new Date(+this.startValue);
             this.previousEndValue = new Date(+this.endValue);
             this.previousEleValue = this.inputElement.value;
-            Input.setValue(this.rangeArgs(eve).text, this.inputElement, this.floatLabelType, this.showClearButton);
+            if (!this.isKeyPressed) {
+                Input.setValue(this.rangeArgs(eve).text, this.inputElement, this.floatLabelType, this.showClearButton);
+            }
+            this.isKeyPressed = false;
             if (+this.initStartDate !== +this.startValue || +this.initEndDate !== +this.endValue) {
                 isValueChanged = true;
             }
@@ -3091,7 +3107,8 @@ var DateRangePicker = /** @class */ (function (_super) {
                     EventHandler.remove(document, 'keydown', _this.popupCloseHandler);
                 }
             }, targetExitViewport: function () {
-                if (!Browser.isDevice) {
+                var popupEle = _this.popupObj && _this.popupObj.element;
+                if (!Browser.isDevice && popupEle && popupEle.getBoundingClientRect().height < popupEle.parentElement.getBoundingClientRect().height) {
                     _this.hide();
                 }
             }

package/src/datetimepicker/datetimepicker.js

@@ -573,7 +573,7 @@ var DateTimePicker = /** @class */ (function (_super) {
             if (!_this.preventArgs.cancel && !_this.readonly) {
                 var openAnimation = {
                     name: 'FadeIn',
-                    duration: ANIMATIONDURATION
+                    duration: ANIMATIONDURATION,
                 };
                 if (_this.zIndex === 1000) {
                     _this.popupObject.show(new Animation(openAnimation), _this.element);

package/src/timepicker/timepicker.js

@@ -992,7 +992,7 @@ var TimePicker = /** @class */ (function (_super) {
     };
     TimePicker.prototype.inputHandler = function (event) {
         if (!this.readonly && this.enabled) {
-            if (!((event.action == 'right' || event.action == 'left' || event.action == 'tab') || ((event.action == 'home' || event.action == 'end') && !this.isPopupOpen()))) {
+            if (!((event.action == 'right' || event.action == 'left' || event.action == 'tab') || ((event.action == 'home' || event.action == 'end' || event.action == 'up' || event.action == 'down') && !this.isPopupOpen() && !this.enableMask))) {
                 event.preventDefault();
             }
             switch (event.action) {
@@ -1795,7 +1795,9 @@ var TimePicker = /** @class */ (function (_super) {
         this.isNavigate = true;
         this.setHover(this.selectedElement, NAVIGATION);
         this.setActiveDescendant();
-        this.selectInputText();
+        if (this.enableMask) {
+            this.selectInputText();
+        }
         if (this.isPopupOpen() && this.selectedElement !== null && (!event || event.type !== 'click')) {
             this.setScrollPosition();
         }

package/styles/bootstrap-dark.css

@@ -987,15 +987,22 @@ ejs-calendar {
   top: 0 !important;
 }
 
+.e-timepicker-mob-popup-wrap .e-popup-expand.e-timepicker.e-popup,
+.e-datetimepicker.e-popup-expand.e-timepicker.e-popup,
+.e-timepicker-mob-popup-wrap .e-popup-expand.e-datetimepicker.e-popup,
+.e-datetimepicker.e-popup-expand.e-popup {
+  border-radius: 0;
+}
+
 .e-timepicker-mob-popup-wrap .e-popup-expand .e-model-header,
 .e-datetimepicker.e-popup-expand .e-model-header {
   height: 10%;
-  padding: 2.5vh 2.5vw;
+  padding: 2.5vh 2.5vw 2.5vh 1.5vw;
   display: -ms-flexbox;
   display: flex;
   -ms-flex-align: center;
       align-items: center;
-  font-size: 3vh;
+  font-size: 2vh;
   border-bottom: 1px solid #414141;
 }
 .e-timepicker-mob-popup-wrap .e-popup-expand .e-model-header .e-popup-close,
@@ -1007,6 +1014,11 @@ ejs-calendar {
 .e-datetimepicker.e-popup-expand .e-model-header .e-model-title {
   padding: 1vh 2vw;
   text-transform: capitalize;
+  font-weight: 500;
+}
+.e-timepicker-mob-popup-wrap .e-popup-expand .e-model-header .e-btn.e-popup-close,
+.e-datetimepicker.e-popup-expand .e-model-header .e-btn.e-popup-close {
+  font-size: 2vh;
 }
 .e-timepicker-mob-popup-wrap .e-popup-expand .e-content,
 .e-datetimepicker.e-popup-expand .e-content {
@@ -1045,6 +1057,10 @@ ejs-calendar {
   .e-datetimepicker.e-popup-expand .e-model-header .e-model-title {
     padding: 1vh 1vw;
   }
+  .e-timepicker-mob-popup-wrap .e-popup-expand .e-model-header .e-btn.e-popup-close,
+  .e-datetimepicker.e-popup-expand .e-model-header .e-btn.e-popup-close {
+    font-size: 2vw;
+  }
   .e-timepicker-mob-popup-wrap .e-popup-expand .e-content,
   .e-datetimepicker.e-popup-expand .e-content {
     height: 85%;
@@ -1113,6 +1129,7 @@ ejs-calendar {
 .e-timepicker-mob-popup-wrap .e-timepicker.e-popup-expand .e-model-header .e-popup-close,
 .e-datetimepicker.e-popup-expand .e-model-header .e-popup-close {
   color: #f0f0f0;
+  font-weight: 500;
 }
 
 /* stylelint-disable property-no-vendor-prefix */
@@ -1264,6 +1281,11 @@ ejs-calendar {
   min-height: 40px;
 }
 
+@media screen and (orientation: landscape) {
+  .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-content.e-month td.e-today span.e-day {
+    line-height: 64px;
+  }
+}
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand {
   border-radius: 0;
 }
@@ -1273,9 +1295,15 @@ ejs-calendar {
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header.e-blazor-device .e-popup-close {
   float: right;
 }
+.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header.e-blazor-device {
+  height: 15vh;
+}
+.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header.e-blazor-device .e-popup-close {
+  float: right;
+}
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header {
   height: 20vh;
-  padding: 2vh 2vw;
+  padding: 2vh 6vw;
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header .e-day-wrapper {
   margin: 12vh 0 0 0;
@@ -1284,13 +1312,19 @@ ejs-calendar {
   color: inherit;
   float: left;
   font-size: 18px;
-  padding: 2px;
 }
 @media (min-device-width: 768px) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header .e-popup-close {
     font-size: 24px;
   }
 }
+.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header .e-btn.e-flat.e-popup-close {
+  background: transparent;
+  border-color: transparent;
+  box-shadow: none;
+  font-weight: 400;
+  padding: 0;
+}
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header .e-today.e-flat.e-primary {
   color: inherit;
   float: right;
@@ -1319,7 +1353,7 @@ ejs-calendar {
   line-height: 5vh;
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-title, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-title, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-title {
-  margin-left: 18vw;
+  margin-left: 22vw;
   position: absolute;
   text-align: center;
   vertical-align: middle;
@@ -1333,13 +1367,19 @@ ejs-calendar {
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-prev, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-prev, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-prev {
   margin-right: 75vw;
+  vertical-align: inherit;
+  height: 35px;
+  width: 35px;
 }
 @media (min-device-width: 768px) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-prev, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-prev, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-prev {
-    height: 34px;
-    width: 34px;
+    height: 55px;
+    width: 55px;
   }
 }
+.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-prev .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-prev .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-prev .e-icons {
+  vertical-align: inherit;
+}
 @media (min-device-width: 768px) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-prev .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-prev .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-prev .e-icons {
     font-size: 24px;
@@ -1347,6 +1387,18 @@ ejs-calendar {
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-next, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-next, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-next {
   margin-right: 0;
+  vertical-align: inherit;
+  height: 35px;
+  width: 35px;
+}
+@media (min-device-width: 768px) {
+  .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-next, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-next, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-next {
+    height: 55px;
+    width: 55px;
+  }
+}
+.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-next .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-next .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-next .e-icons {
+  vertical-align: inherit;
 }
 @media (min-device-width: 768px) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-next .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-next .e-icons, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-next .e-icons {
@@ -1371,15 +1423,11 @@ ejs-calendar {
   }
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar-cell-container {
-  height: 85vh;
+  height: 79vh;
 }
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-footer-container {
   display: none;
 }
-.e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar-cell-container .e-footer-container {
-  display: block;
-  padding: 5px 0;
-}
 .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-content.e-month {
   height: 69vh;
 }
@@ -1438,7 +1486,6 @@ ejs-calendar {
 @media screen and (orientation: landscape) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-model-header .e-popup-close {
     float: left;
-    padding: 2px;
   }
 }
 @media screen and (orientation: landscape) {
@@ -1458,7 +1505,7 @@ ejs-calendar {
 }
 @media screen and (orientation: landscape) and (max-height: 600px) {
   .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-month .e-title, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-year .e-title, .e-datepick-mob-popup-wrap .e-datepicker.e-popup-expand .e-calendar .e-header.e-decade .e-title {
-    line-height: 8vh;
+    line-height: 12vh;
   }
 }
 @media screen and (orientation: landscape) and (min-height: 600px) {
@@ -2209,7 +2256,7 @@ ejs-calendar {
 }
 @media (min-device-width: 768px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-model-header-wrapper {
-    font-size: 24px;
+    font-size: 18px;
   }
 }
 .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-model-header-wrapper .e-apply {
@@ -2244,17 +2291,27 @@ ejs-calendar {
   padding: 2vh 2vw;
   line-height: 5vh;
 }
-.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-prev, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-prev, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-prev, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next {
+.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-prev, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-prev, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-prev {
   height: 36px;
   width: 36px;
 }
-.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next span {
+@media (min-device-width: 768px) {
+  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-prev span {
+    font-size: 18px;
+    padding: 11px;
+  }
+}
+.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next {
+  height: 36px;
+  width: 36px;
+}
+.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next span {
   padding: 10px;
   line-height: 1;
 }
 @media (min-device-width: 768px) {
-  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-prev span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next span {
-    font-size: 24px;
+  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-next span, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-next span {
+    font-size: 18px;
   }
 }
 @media (max-height: 600px) {
@@ -2269,18 +2326,18 @@ ejs-calendar {
 }
 @media (min-device-width: 768px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-month .e-title, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-year .e-title, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-header.e-decade .e-title {
-    font-size: 24px;
+    font-size: 18px;
   }
 }
 @media (min-device-width: 768px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar th {
-    font-size: 24px;
+    font-size: 18px;
     height: 48px;
   }
 }
 @media (min-device-width: 768px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-calendar .e-content span.e-day {
-    font-size: 24px;
+    font-size: 18px;
     height: 64px;
     width: 64px;
     line-height: 64px;
@@ -2304,12 +2361,6 @@ ejs-calendar {
     height: 78vh;
   }
 }
-.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-calendar-holder .e-footer {
-  display: block;
-}
-.e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-calendar-holder .e-footer .e-btn.e-apply, .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-calendar-holder .e-footer .e-btn.e-cancel {
-  float: right;
-}
 @media (max-height: 600px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-calendar-container {
     min-height: 100%;
@@ -2357,7 +2408,7 @@ ejs-calendar {
 }
 .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-range-mob-popup-wrap .e-model-header {
   height: 10%;
-  padding: 2.5vh 2.5vw;
+  padding: 2.5vh 2.5vw 2.5vh 1.5vw;
   display: -ms-flexbox;
   display: flex;
   -ms-flex-align: center;
@@ -2367,7 +2418,7 @@ ejs-calendar {
 }
 @media (min-device-width: 768px) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-range-mob-popup-wrap .e-model-header {
-    font-size: 2vw;
+    font-size: 18px;
   }
 }
 .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-range-mob-popup-wrap .e-model-header .e-popup-close {
@@ -2379,14 +2430,14 @@ ejs-calendar {
   text-transform: capitalize;
 }
 
-@media screen and (orientation: landscape) and (max-height: 600px) {
-  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header.e-blazor-device {
-    height: 23vh;
+@media screen and (orientation: landscape) {
+  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-model-header-wrapper .e-btn {
+    padding: 0;
   }
 }
-@media screen and (orientation: landscape) and (min-height: 600px) {
-  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header.e-blazor-device {
-    height: 20vh;
+@media screen and (orientation: landscape) and (min-device-width: 768px) {
+  .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-model-header-wrapper .e-btn {
+    font-size: 18px;
   }
 }
 @media screen and (orientation: landscape) and (min-height: 600px) {
@@ -2421,7 +2472,7 @@ ejs-calendar {
 @media screen and (orientation: landscape) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-range-mob-popup-wrap .e-model-header {
     height: 15%;
-    font-size: 2vw;
+    font-size: 18px;
   }
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-range-mob-popup-wrap .e-model-header .e-popup-close {
     padding: 1vh 1vw;
@@ -2448,7 +2499,7 @@ ejs-calendar {
 @media screen and (orientation: landscape) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-start-end {
     margin: 0;
-    height: 38px;
+    height: 28px;
   }
 }
 @media screen and (orientation: landscape) and (min-height: 600px) {
@@ -2458,8 +2509,8 @@ ejs-calendar {
 }
 @media screen and (orientation: landscape) {
   .e-daterangepick-mob-popup-wrap .e-daterangepicker.e-popup.e-popup-expand .e-date-range-container .e-range-header .e-day-span {
-    margin: 5px 0;
-    font-size: 20px;
+    margin: 8px 0;
+    font-size: 16px;
   }
 }
 @media screen and (orientation: landscape) and (min-height: 600px) {