@syncfusion/ej2-calendars 20.2.38 → 20.2.40

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.38
+*  version : 20.2.40
 *  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@20.2.36",
+  "_id": "@syncfusion/ej2-calendars@20.2.38",
   "_inBundle": false,
-  "_integrity": "sha512-UFDUzNYkbmOgWfZRpjl+qyaE/IjQiDu4Bg0qgUtyKCo3sDXPaetRHT3vEG4Pvb0jA/NobBNFA3lDAiEm6kQqhQ==",
+  "_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.2.36.tgz",
-  "_shasum": "c4ce9b96ae01271434047d5b399408cf2cb5b32c",
+  "_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.2.38",
+    "@syncfusion/ej2-base": "~20.2.39",
     "@syncfusion/ej2-buttons": "~20.2.38",
     "@syncfusion/ej2-inputs": "~20.2.38",
-    "@syncfusion/ej2-lists": "~20.2.38",
-    "@syncfusion/ej2-popups": "~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.2.38",
+  "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])) {