@syncfusion/ej2-calendars 20.1.58 → 20.2.40

package/helpers/e2e/datetimepickerHelper.js

@@ -1,110 +1,126 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const e2e_1 = require("@syncfusion/ej2-base/helpers/e2e");
-class datetimepickerHelper extends e2e_1.TestHelper {
-    constructor(id, wrapperFn) {
-        super();
-        this.id = id;
-        if (wrapperFn !== undefined) {
-            this.wrapperFn = wrapperFn;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var datetimepickerHelper = (function (_super) {
+        __extends(datetimepickerHelper, _super);
+        function datetimepickerHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
         }
-        return this;
-    }
-    selector(arg) {
-        return (this.wrapperFn ? this.wrapperFn(arg) : arg);
-    }
-    getElement() {
-        return this.selector('#' + this.id);
-    }
-    getDateIcon() {
-        return this.selector('.e-datetime-wrapper .e-date-icon');
-    }
-    getTimeIcon() {
-        return this.selector('.e-datetime-wrapper .e-time-icon');
-    }
-    getClearIcon() {
-        return this.selector('.e-datetime-wrapper .e-clear-icon');
-    }
-    getInputFocus() {
-        return this.selector('.e-datetime-wrapper.e-input-focus');
-    }
-    getPopupElement() {
-        return this.selector('.e-datepicker.e-popup-wrapper');
-    }
-    getCalender() {
-        return this.selector('.e-datepicker .e-calendar.e-lib.e-keyboard');
-    }
-    getCalendarMonthHeader() {
-        return this.selector('.e-datepicker .e-calendar .e-header.e-month');
-    }
-    getCalendarYearHeader() {
-        return this.selector('.e-datepicker .e-calendar .e-header.e-year');
-    }
-    getCalendarDecadeHeader() {
-        return this.selector('.e-datepicker .e-calendar .e-header.e-decade');
-    }
-    getTitleElement() {
-        return this.selector('.e-datepicker .e-calendar .e-header .e-day.e-title');
-    }
-    getIconContainer() {
-        return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container');
-    }
-    getPrevIcon() {
-        return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container .e-prev');
-    }
-    getNextIcon() {
-        return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container .e-next');
-    }
-    getWeeKHeader() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-week-header');
-    }
-    getCellElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell');
-    }
-    getOtherMonthCellElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-other-month');
-    }
-    getSelectedCellElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-selected');
-    }
-    getTodayElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-today');
-    }
-    getDisabledElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-disabled.e-overlay');
-    }
-    getFocusedElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-focused-date');
-    }
-    getWeenkendElement() {
-        return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-weekend');
-    }
-    getFooterContainer() {
-        return this.selector('.e-datepicker .e-calendar .e-footer-container');
-    }
-    getToday() {
-        return this.selector('.e-datepicker .e-calendar .e-footer-container .e-today');
-    }
-    getWeekNumber() {
-        return this.selector('.e-datepicker .e-calendar.e-week-number .e-content .e-cell.e-week-number');
-    }
-    getTimePopup() {
-        return this.selector('.e-datetimepicker.e-popup');
-    }
-    getTimePopupContent() {
-        return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent');
-    }
-    getTimePopupItem() {
-        return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item');
-    }
-    getTimePopupActiveItem() {
-        return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-active');
-    }
-    getTimePopupHoverItem() {
-        return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-hover');
-    }
-    getTimePopupDisabledItem() {
-        return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-disabled');
-    }
-}
-exports.datetimepickerHelper = datetimepickerHelper;
+        datetimepickerHelper.prototype.selector = function (arg) {
+            return (this.wrapperFn ? this.wrapperFn(arg) : arg);
+        };
+        datetimepickerHelper.prototype.getElement = function () {
+            return this.selector('#' + this.id);
+        };
+        datetimepickerHelper.prototype.getDateIcon = function () {
+            return this.selector('.e-datetime-wrapper .e-date-icon');
+        };
+        datetimepickerHelper.prototype.getTimeIcon = function () {
+            return this.selector('.e-datetime-wrapper .e-time-icon');
+        };
+        datetimepickerHelper.prototype.getClearIcon = function () {
+            return this.selector('.e-datetime-wrapper .e-clear-icon');
+        };
+        datetimepickerHelper.prototype.getInputFocus = function () {
+            return this.selector('.e-datetime-wrapper.e-input-focus');
+        };
+        datetimepickerHelper.prototype.getPopupElement = function () {
+            return this.selector('.e-datepicker.e-popup-wrapper');
+        };
+        datetimepickerHelper.prototype.getCalender = function () {
+            return this.selector('.e-datepicker .e-calendar.e-lib.e-keyboard');
+        };
+        datetimepickerHelper.prototype.getCalendarMonthHeader = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header.e-month');
+        };
+        datetimepickerHelper.prototype.getCalendarYearHeader = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header.e-year');
+        };
+        datetimepickerHelper.prototype.getCalendarDecadeHeader = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header.e-decade');
+        };
+        datetimepickerHelper.prototype.getTitleElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header .e-day.e-title');
+        };
+        datetimepickerHelper.prototype.getIconContainer = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container');
+        };
+        datetimepickerHelper.prototype.getPrevIcon = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container .e-prev');
+        };
+        datetimepickerHelper.prototype.getNextIcon = function () {
+            return this.selector('.e-datepicker .e-calendar .e-header .e-icon-container .e-next');
+        };
+        datetimepickerHelper.prototype.getWeeKHeader = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-week-header');
+        };
+        datetimepickerHelper.prototype.getCellElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell');
+        };
+        datetimepickerHelper.prototype.getOtherMonthCellElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-other-month');
+        };
+        datetimepickerHelper.prototype.getSelectedCellElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-selected');
+        };
+        datetimepickerHelper.prototype.getTodayElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-today');
+        };
+        datetimepickerHelper.prototype.getDisabledElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-disabled.e-overlay');
+        };
+        datetimepickerHelper.prototype.getFocusedElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-focused-date');
+        };
+        datetimepickerHelper.prototype.getWeenkendElement = function () {
+            return this.selector('.e-datepicker .e-calendar .e-content .e-cell.e-weekend');
+        };
+        datetimepickerHelper.prototype.getFooterContainer = function () {
+            return this.selector('.e-datepicker .e-calendar .e-footer-container');
+        };
+        datetimepickerHelper.prototype.getToday = function () {
+            return this.selector('.e-datepicker .e-calendar .e-footer-container .e-today');
+        };
+        datetimepickerHelper.prototype.getWeekNumber = function () {
+            return this.selector('.e-datepicker .e-calendar.e-week-number .e-content .e-cell.e-week-number');
+        };
+        datetimepickerHelper.prototype.getTimePopup = function () {
+            return this.selector('.e-datetimepicker.e-popup');
+        };
+        datetimepickerHelper.prototype.getTimePopupContent = function () {
+            return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent');
+        };
+        datetimepickerHelper.prototype.getTimePopupItem = function () {
+            return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item');
+        };
+        datetimepickerHelper.prototype.getTimePopupActiveItem = function () {
+            return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-active');
+        };
+        datetimepickerHelper.prototype.getTimePopupHoverItem = function () {
+            return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-hover');
+        };
+        datetimepickerHelper.prototype.getTimePopupDisabledItem = function () {
+            return this.selector('.e-datetimepicker.e-popup .e-content .e-list-parent .e-list-item.e-disabled');
+        };
+        return datetimepickerHelper;
+    }(e2e_1.TestHelper));
+    exports.datetimepickerHelper = datetimepickerHelper;
+});

package/helpers/e2e/index.js

@@ -1,10 +1,12 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./calendarHelper"));
-__export(require("./datepickerHelper"));
-__export(require("./datetimepickerHelper"));
-__export(require("./daterangepickerHelper"));
-__export(require("./timepickerHelper"));
+define(["require", "exports", "./calendarHelper", "./datepickerHelper", "./datetimepickerHelper", "./daterangepickerHelper", "./timepickerHelper"], function (require, exports, calendarHelper_1, datepickerHelper_1, datetimepickerHelper_1, daterangepickerHelper_1, timepickerHelper_1) {
+    "use strict";
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    __export(calendarHelper_1);
+    __export(datepickerHelper_1);
+    __export(datetimepickerHelper_1);
+    __export(daterangepickerHelper_1);
+    __export(timepickerHelper_1);
+});

package/helpers/e2e/timepickerHelper.js

@@ -1,47 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const e2e_1 = require("@syncfusion/ej2-base/helpers/e2e");
-class timepickerHelper extends e2e_1.TestHelper {
-    constructor(id, wrapperFn) {
-        super();
-        this.id = id;
-        if (wrapperFn !== undefined) {
-            this.wrapperFn = wrapperFn;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var timepickerHelper = (function (_super) {
+        __extends(timepickerHelper, _super);
+        function timepickerHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
         }
-        return this;
-    }
-    selector(arg) {
-        return (this.wrapperFn ? this.wrapperFn(arg) : arg);
-    }
-    getElement() {
-        return this.selector('#' + this.id);
-    }
-    getTimePickerInput() {
-        return this.selector('.e-control.e-timepicker.e-lib.e-input');
-    }
-    getTimePickerIcon() {
-        return this.selector('.e-time-wrapper .e-time-icon');
-    }
-    getTimePickerClearIcon() {
-        return this.selector('.e-time-wrapper .e-clear-icon');
-    }
-    getTimePicker() {
-        return this.selector('.e-input-group.e-control-wrapper');
-    }
-    getTimePickerContent() {
-        return this.selector('.e-timepicker .e-content');
-    }
-    getTimePickerListContent() {
-        return this.selector('.e-timepicker .e-content .e-list-parent');
-    }
-    getTimePickerListItem() {
-        return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item');
-    }
-    getTimePickerDisabledTime() {
-        return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item.e-disabled');
-    }
-    getTimePickerSelectedTime() {
-        return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item.e-active');
-    }
-}
-exports.timepickerHelper = timepickerHelper;
+        timepickerHelper.prototype.selector = function (arg) {
+            return (this.wrapperFn ? this.wrapperFn(arg) : arg);
+        };
+        timepickerHelper.prototype.getElement = function () {
+            return this.selector('#' + this.id);
+        };
+        timepickerHelper.prototype.getTimePickerInput = function () {
+            return this.selector('.e-control.e-timepicker.e-lib.e-input');
+        };
+        timepickerHelper.prototype.getTimePickerIcon = function () {
+            return this.selector('.e-time-wrapper .e-time-icon');
+        };
+        timepickerHelper.prototype.getTimePickerClearIcon = function () {
+            return this.selector('.e-time-wrapper .e-clear-icon');
+        };
+        timepickerHelper.prototype.getTimePicker = function () {
+            return this.selector('.e-input-group.e-control-wrapper');
+        };
+        timepickerHelper.prototype.getTimePickerContent = function () {
+            return this.selector('.e-timepicker .e-content');
+        };
+        timepickerHelper.prototype.getTimePickerListContent = function () {
+            return this.selector('.e-timepicker .e-content .e-list-parent');
+        };
+        timepickerHelper.prototype.getTimePickerListItem = function () {
+            return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item');
+        };
+        timepickerHelper.prototype.getTimePickerDisabledTime = function () {
+            return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item.e-disabled');
+        };
+        timepickerHelper.prototype.getTimePickerSelectedTime = function () {
+            return this.selector('.e-timepicker .e-content .e-list-parent .e-list-item.e-active');
+        };
+        return timepickerHelper;
+    }(e2e_1.TestHelper));
+    exports.timepickerHelper = timepickerHelper;
+});

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-calendars@*",
-  "_id": "@syncfusion/ej2-calendars@20.1.57",
+  "_id": "@syncfusion/ej2-calendars@20.2.38",
   "_inBundle": false,
-  "_integrity": "sha512-1d71Wl4x+o2XUbRhD4AZIHm1tqaPJxGAG14aUu7dvcNM0ouhbVC7xkj0Ltb24Ivb3hdDk8e+qo5jSnfzT0oCpw==",
+  "_integrity": "sha512-3Nvq36mXmkyj4dgK6Xb2kxSA90GPfXT1cVO+115iy+KFnqEplCv18sbkLeMSZqkfKvCKmDVYfV/2S8IuhXu0OQ==",
   "_location": "/@syncfusion/ej2-calendars",
   "_phantomChildren": {},
   "_requested": {
@@ -32,8 +32,8 @@
     "/@syncfusion/ej2-schedule",
     "/@syncfusion/ej2-vue-calendars"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-calendars/-/ej2-calendars-20.1.57.tgz",
-  "_shasum": "fca2aba08c56c3a6bc32c7896588a9dfe7187f05",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-calendars/-/ej2-calendars-20.2.38.tgz",
+  "_shasum": "02258f4ba3c38c0a39179224cf5cd031961a7871",
   "_spec": "@syncfusion/ej2-calendars@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -44,11 +44,11 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.57",
-    "@syncfusion/ej2-buttons": "~20.1.55",
-    "@syncfusion/ej2-inputs": "~20.1.58",
-    "@syncfusion/ej2-lists": "~20.1.55",
-    "@syncfusion/ej2-popups": "~20.1.58"
+    "@syncfusion/ej2-base": "~20.2.39",
+    "@syncfusion/ej2-buttons": "~20.2.38",
+    "@syncfusion/ej2-inputs": "~20.2.38",
+    "@syncfusion/ej2-lists": "~20.2.39",
+    "@syncfusion/ej2-popups": "~20.2.40"
   },
   "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": "20.1.58",
+  "version": "20.2.40",
   "sideEffects": false
 }

package/src/calendar/calendar.d.ts

@@ -44,8 +44,11 @@ export declare class CalendarBase extends Component<HTMLElement> implements INot
     protected navigateNextHandler: Function;
     protected l10: L10n;
     protected todayDisabled: boolean;
+    protected nextIconClicked: boolean;
+    protected previousIconClicked: boolean;
     protected tabIndex: string;
     protected todayDate: Date;
+    protected islamicPreviousHeader: any;
     protected calendarElement: HTMLElement;
     protected isPopupClicked: boolean;
     protected isDateSelected: boolean;

package/src/calendar/calendar.js

@@ -1095,6 +1095,7 @@ var CalendarBase = /** @class */ (function (_super) {
                         this.currentDate.setFullYear(d.getFullYear());
                     }
                     else {
+                        this.islamicPreviousHeader = this.headerElement.textContent;
                         var islamicDate = this.islamicModule.getIslamicDate(d);
                         this.currentDate = this.islamicModule.toGregorian(islamicDate.year, islamicDate.month, 1);
                     }

package/src/calendar/islamic.js

@@ -201,6 +201,8 @@ var Islamic = /** @class */ (function () {
                 this.calendarInstance.switchView(view);
                 break;
             case 'Decade':
+                this.calendarInstance.nextIconClicked = true;
+                islamicDate.year = islamicDate.year - this.calendarInstance.headerElement.textContent.split('-')[0].trim() === 1 ? islamicDate.year + 1 : islamicDate.year;
                 this.calendarInstance.currentDate = this.toGregorian(islamicDate.year + 10, islamicDate.month, 1);
                 this.calendarInstance.switchView(view);
                 break;
@@ -220,6 +222,7 @@ var Islamic = /** @class */ (function () {
                 this.calendarInstance.switchView(currentView);
                 break;
             case 'Decade':
+                this.calendarInstance.previousIconClicked = true;
                 this.calendarInstance.currentDate = this.toGregorian(islamicDate.year - 10, islamicDate.month - 1, 1);
                 this.calendarInstance.switchView(currentView);
                 break;
@@ -289,43 +292,93 @@ var Islamic = /** @class */ (function () {
         var endFullYr = endYr.getFullYear();
         var startHdrYr = this.calendarInstance.globalize.formatDate(startYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
         var endHdrYr = this.calendarInstance.globalize.formatDate(endYr, { type: 'dateTime', format: 'y', calendar: 'islamic' });
+        if (this.calendarInstance.islamicPreviousHeader) {
+            startHdrYr = this.calendarInstance.islamicPreviousHeader.split('-')[0].trim();
+            endHdrYr = this.calendarInstance.islamicPreviousHeader.split('-')[1].trim();
+            this.calendarInstance.islamicPreviousHeader = null;
+        }
+        var splityear = this.calendarInstance.headerElement.textContent.split('-');
+        if (this.calendarInstance.previousIconClicked) {
+            for (var i = 0; i <= splityear.length; i++) {
+                endHdrYr = endHdrYr - splityear[i] === 2 || splityear[i] - endHdrYr === 2 ? (parseInt(endHdrYr) + 1).toString() : endHdrYr - splityear[i] === 3 || splityear[i] - endHdrYr === 3 ? (parseInt(endHdrYr) + 2).toString() : endHdrYr - splityear[i] === 4 || splityear[i] - endHdrYr === 4 ? (parseInt(endHdrYr) + 3).toString() : endHdrYr - splityear[i] === 5 || splityear[i] - endHdrYr === 5 ? (parseInt(endHdrYr) + 4).toString() : endHdrYr;
+                if (endHdrYr - splityear[i] === 0 || splityear[i] - endHdrYr === 0) {
+                    endHdrYr = (parseInt(endHdrYr) - 1).toString();
+                }
+            }
+            startHdrYr = endHdrYr - startHdrYr === 10
+                ? (parseInt(startHdrYr) + 1).toString() : endHdrYr - startHdrYr === 11
+                ? (parseInt(startHdrYr) + 2).toString() : endHdrYr - startHdrYr === 12
+                ? (parseInt(startHdrYr) + 3).toString() : startHdrYr;
+            startHdrYr = endHdrYr - startHdrYr === 8 ? (parseInt(startHdrYr) - 1).toString() : startHdrYr;
+        }
+        if (this.calendarInstance.nextIconClicked) {
+            for (var i = 0; i <= splityear.length; i++) {
+                if (startHdrYr - splityear[i] === 0 || splityear[i] - startHdrYr === 0) {
+                    startHdrYr = (parseInt(startHdrYr) + 1).toString();
+                }
+                if (startHdrYr - splityear[i] === 2 && startHdrYr > splityear[i].trim()) {
+                    startHdrYr = (parseInt(startHdrYr) - 1).toString();
+                }
+                if (splityear[i] - startHdrYr === 1 && startHdrYr < splityear[i].trim()) {
+                    startHdrYr = (parseInt(startHdrYr) + 2).toString();
+                }
+            }
+            endHdrYr = endHdrYr - startHdrYr === 10 ? (parseInt(endHdrYr) - 1).toString() : endHdrYr;
+            endHdrYr = endHdrYr - startHdrYr === 7
+                ? (parseInt(endHdrYr) + 2).toString() : endHdrYr - startHdrYr === 8
+                ? (parseInt(endHdrYr) + 1).toString() : endHdrYr;
+        }
         this.calendarInstance.headerTitleElement.textContent = startHdrYr + ' - ' + (endHdrYr);
-        var start = new Date(localYr - (localYr % 10) - 2, 0, 1);
-        var startYear = start.getFullYear();
+        this.calendarInstance.nextIconClicked = this.calendarInstance.previousIconClicked = false;
+        var year = (parseInt(startHdrYr) - 2).toString();
+        startFullYr = Math.round(parseInt(startHdrYr) * 0.97 + 622);
+        endFullYr = Math.round(parseInt(endHdrYr) * 0.97 + 622);
+        var startYear = Math.round(parseInt(year) * 0.97 + 622);
         for (var rowCount = 1; rowCount <= yearCell; ++rowCount) {
-            var year = startYear + rowCount;
-            localDate.setFullYear(year);
+            var year_1 = startYear + rowCount;
+            localDate.setFullYear(year_1);
             localDate.setDate(1);
             localDate.setMonth(0);
-            var islamicDate_2 = this.getIslamicDate(localDate);
-            var gregorianObject_2 = HijriParser.toGregorian(islamicDate_2.year, 1, 1);
-            localDate = gregorianObject_2;
-            var tdEle = this.islamicDayCell(localDate);
-            attributes(tdEle, { 'role': 'gridcell' });
-            var dayLink = this.calendarInstance.createElement('span');
-            dayLink.textContent = this.calendarInstance.globalize.formatDate(localDate, { type: 'dateTime', format: 'y', calendar: 'islamic' });
-            if ((year < startFullYr) || (year > endFullYr)) {
-                addClass([tdEle], OTHERMONTH);
-            }
-            else if (year < new Date(this.islamicInValue(this.calendarInstance.min)).getFullYear()
-                || year > new Date(this.islamicInValue(this.calendarInstance.max)).getFullYear()) {
-                addClass([tdEle], DISABLED);
-            }
-            else if (!isNullOrUndefined(value) &&
-                (this.getIslamicDate(localDate)).year ===
-                    (this.getIslamicDate(value)).year) {
-                addClass([tdEle], SELECTED);
+            if ((this.getIslamicDate(localDate).year - islamicDate.year) > 1) {
+                localDate.setMonth(1);
+                rowCount = rowCount - 1;
+                localDate.setFullYear(localDate.getFullYear() - 1);
             }
-            else {
-                if (localDate.getFullYear() === this.calendarInstance.currentDate.getFullYear() && !tdEle.classList.contains(DISABLED)) {
-                    addClass([tdEle], FOCUSEDDATE);
+            islamicDate = this.getIslamicDate(localDate);
+            var gregorianObject_2 = HijriParser.toGregorian(islamicDate.year, 1, 1);
+            localDate = gregorianObject_2;
+            if (islamicDate.year === parseInt(startHdrYr) - 1 || islamicDate.year >= startHdrYr && islamicDate.year <= endFullYr || islamicDate.year === parseInt(endHdrYr) + 1) {
+                var tdEle = this.islamicDayCell(localDate);
+                attributes(tdEle, { 'role': 'gridcell' });
+                var dayLink = this.calendarInstance.createElement('span');
+                dayLink.textContent = this.calendarInstance.globalize.formatDate(localDate, { type: 'dateTime', format: 'y', calendar: 'islamic' });
+                if (islamicDate.year === parseInt(startHdrYr) - 1 || (year_1 < startFullYr) || (year_1 > endFullYr) && islamicDate.year !== parseInt(endHdrYr)) {
+                    addClass([tdEle], OTHERMONTH);
+                    if (year_1 < new Date(this.islamicInValue(this.calendarInstance.min)).getFullYear()
+                        || year_1 > new Date(this.islamicInValue(this.calendarInstance.max)).getFullYear()) {
+                        addClass([tdEle], DISABLED);
+                    }
                 }
+                else if (year_1 < new Date(this.islamicInValue(this.calendarInstance.min)).getFullYear()
+                    || year_1 > new Date(this.islamicInValue(this.calendarInstance.max)).getFullYear()) {
+                    addClass([tdEle], DISABLED);
+                }
+                else if (!isNullOrUndefined(value) &&
+                    (this.getIslamicDate(localDate)).year ===
+                        (this.getIslamicDate(value)).year) {
+                    addClass([tdEle], SELECTED);
+                }
+                else {
+                    if (localDate.getFullYear() === this.calendarInstance.currentDate.getFullYear() && !tdEle.classList.contains(DISABLED)) {
+                        addClass([tdEle], FOCUSEDDATE);
+                    }
+                }
+                if (!tdEle.classList.contains(DISABLED)) {
+                    EventHandler.add(tdEle, 'click', this.calendarInstance.clickHandler, this.calendarInstance);
+                }
+                tdEle.appendChild(dayLink);
+                tdEles.push(tdEle);
             }
-            if (!tdEle.classList.contains(DISABLED)) {
-                EventHandler.add(tdEle, 'click', this.calendarInstance.clickHandler, this.calendarInstance);
-            }
-            tdEle.appendChild(dayLink);
-            tdEles.push(tdEle);
         }
         this.islamicRenderTemplate(tdEles, numCells, 'e-decade', e, value);
     };
@@ -352,7 +405,7 @@ var Islamic = /** @class */ (function () {
         var otherMonthCell = 6;
         var row = count;
         var rowCount = 0;
-        for (var dayCell = 0; dayCell < elements.length / count; ++dayCell) {
+        for (var dayCell = 0; dayCell < Math.round(elements.length / count); ++dayCell) {
             trEle = this.calendarInstance.createElement('tr', { attrs: { 'role': 'row' } });
             for (rowCount = 0 + rowCount; rowCount < row; rowCount++) {
                 if (!elements[rowCount].classList.contains('e-week-number') && !isNullOrUndefined(elements[rowCount].children[0])) {

package/src/maskbase/masked-date-time.js

@@ -211,9 +211,9 @@ var MaskedDateTime = /** @class */ (function () {
         switch (this.previousHiddenMask[start - 1]) {
             case 'd':
                 var date = (this.isDayPart && newDateValue.getDate().toString().length < 2 && !this.isPersist() ? newDateValue.getDate() * 10 : 0) + parseInt(newVal[start - 1], 10);
+                this.isDateZero = (newVal[start - 1] == '0');
                 this.parent.isFocused = this.parent.isFocused ? false : this.parent.isFocused;
                 this.navigated = this.navigated ? false : this.navigated;
-                this.isDateZero = (newVal[start - 1] == '0');
                 if (isNaN(date)) {
                     return;
                 }