@syncfusion/ej2-calendars 21.2.3 → 21.2.5

package/dist/es6/ej2-calendars.es2015.js

@@ -2876,6 +2876,10 @@ class Islamic {
         let endFullYr = endYr.getFullYear();
         let startHdrYr = this.calendarInstance.globalize.formatDate(startYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
         let endHdrYr = this.calendarInstance.globalize.formatDate(endYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
+        if (this.calendarInstance.locale === 'ar') {
+            startHdrYr = Number(startHdrYr.replace(/[٠١٢٣٤٥٦٧٨٩]/g, (d) => String.fromCharCode(d.charCodeAt(0) - 1632 + 48)));
+            endHdrYr = Number(endHdrYr.replace(/[٠١٢٣٤٥٦٧٨٩]/g, (d) => String.fromCharCode(d.charCodeAt(0) - 1632 + 48)));
+        }
         const splityear = this.calendarInstance.headerElement.textContent.split('-');
         if ((!isNullOrUndefined(e) && (splityear[0] !== startHdrYr) && e.action === 'home') || (!isNullOrUndefined(e) && e.type === 'keydown' && e.action === 'end')) {
             startHdrYr = this.calendarInstance.headerElement.textContent.split('-')[0].trim();
@@ -2937,7 +2941,14 @@ class Islamic {
                 ? (parseInt(endHdrYr, 10) + 2).toString() : endHdrYr - startHdrYr === 8
                 ? (parseInt(endHdrYr, 10) + 1).toString() : endHdrYr;
         }
-        this.calendarInstance.headerTitleElement.textContent = startHdrYr + ' - ' + (endHdrYr);
+        if (this.calendarInstance.locale === 'ar') {
+            const startHeaderYear = this.calendarInstance.globalize.formatDate(startYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
+            const endHeaderYear = this.calendarInstance.globalize.formatDate(endYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
+            this.calendarInstance.headerTitleElement.textContent = startHeaderYear + ' - ' + (endHeaderYear);
+        }
+        else {
+            this.calendarInstance.headerTitleElement.textContent = startHdrYr + ' - ' + (endHdrYr);
+        }
         this.calendarInstance.nextIconClicked = this.calendarInstance.previousIconClicked = false;
         const year = (parseInt(startHdrYr, 10) - 2).toString();
         startFullYr = Math.round(parseInt(startHdrYr, 10) * 0.97 + 622);
@@ -4413,7 +4424,7 @@ let DatePicker = class DatePicker extends Calendar {
             this.modal = null;
         }
         if (Browser.isDevice) {
-            if (!isNullOrUndefined(this.mobilePopupWrapper)) {
+            if (!isNullOrUndefined(this.mobilePopupWrapper) && (prevent && (isNullOrUndefined(this.preventArgs) || !this.preventArgs.cancel))) {
                 this.mobilePopupWrapper.remove();
                 this.mobilePopupWrapper = null;
             }
@@ -11885,7 +11896,7 @@ let TimePicker = class TimePicker extends Component {
                     this.invalidValueString = null;
                     this.checkInvalidValue(newProp.value);
                     newProp.value = this.value;
-                    if (!this.invalidValueString && !this.enableMask) {
+                    if (!this.invalidValueString) {
                         if (typeof newProp.value === 'string') {
                             this.setProperties({ value: this.checkDateValue(new Date(newProp.value)) }, true);
                             newProp.value = this.value;
@@ -11898,14 +11909,14 @@ let TimePicker = class TimePicker extends Component {
                         this.initValue = newProp.value;
                         newProp.value = this.compareFormatChange(this.checkValue(newProp.value));
                     }
-                    else if (this.enableMask) {
-                        this.updateInputValue(this.maskedDateValue);
-                        this.checkErrorState(this.maskedDateValue);
-                    }
                     else {
                         this.updateInputValue(this.invalidValueString);
                         this.checkErrorState(this.invalidValueString);
                     }
+                    if (this.enableMask && isNullOrUndefined(newProp.value)) {
+                        this.updateInputValue(this.maskedDateValue);
+                        this.checkErrorState(this.maskedDateValue);
+                    }
                     this.checkValueChange(null, false);
                     if (this.isPopupOpen()) {
                         this.setScrollPosition();