diff --git a/packages/base/src/sap/ui/webcomponents/base/delegate/ItemNavigation.js b/packages/base/src/sap/ui/webcomponents/base/delegate/ItemNavigation.js
index 3ee852c40255..ff4c639370fe 100644
--- a/packages/base/src/sap/ui/webcomponents/base/delegate/ItemNavigation.js
+++ b/packages/base/src/sap/ui/webcomponents/base/delegate/ItemNavigation.js
@@ -139,6 +139,10 @@ class ItemNavigation extends EventProvider {
this.currentIndex -= this.rowSize;
}
+ if (this.currentIndex < 0) {
+ this.currentIndex = 0;
+ }
+
const currentItem = items[this.currentIndex];
if (currentItem instanceof WebComponent) {
diff --git a/packages/main/src/Calendar.js b/packages/main/src/Calendar.js
index aef967e4329b..4e8f4b38f0f2 100644
--- a/packages/main/src/Calendar.js
+++ b/packages/main/src/Calendar.js
@@ -303,6 +303,10 @@ class Calendar extends WebComponent {
nextMonth.setDate(1);
nextMonth.setMonth(nextMonth.getMonth() + 1);
+ if (nextMonth.getYear() > YearPicker._MAX_YEAR) {
+ return;
+ }
+
this._focusFirstDayOfMonth(nextMonth);
this.timestamp = nextMonth.valueOf() / 1000;
}
@@ -333,14 +337,16 @@ class Calendar extends WebComponent {
const weekDaysCount = 7;
- // find the DOM for the last day index
- const lastDay = dayPicker.shadowRoot.querySelector(".sapWCDayPickerItemsContainer").children[parseInt(lastDayOfMonthIndex / weekDaysCount)].children[(lastDayOfMonthIndex % weekDaysCount)];
+ if (lastDayOfMonthIndex !== -1) {
+ // find the DOM for the last day index
+ const lastDay = dayPicker.shadowRoot.querySelector(".sapWCDayPickerItemsContainer").children[parseInt(lastDayOfMonthIndex / weekDaysCount)].children[(lastDayOfMonthIndex % weekDaysCount)];
- // update current item in ItemNavigation
- dayPicker._itemNav.current = lastDayOfMonthIndex;
+ // update current item in ItemNavigation
+ dayPicker._itemNav.current = lastDayOfMonthIndex;
- // focus the item
- lastDay.focus();
+ // focus the item
+ lastDay.focus();
+ }
if (iNewMonth > 11) {
iNewMonth = 0;
@@ -356,10 +362,18 @@ class Calendar extends WebComponent {
oNewDate.setYear(iNewYear);
oNewDate.setMonth(iNewMonth);
+
+ if (oNewDate.getYear() < YearPicker._MIN_YEAR) {
+ return;
+ }
this.timestamp = oNewDate.valueOf() / 1000;
}
_showNextYear() {
+ if (this._calendarDate.getYear() === YearPicker._MAX_YEAR) {
+ return;
+ }
+
const oNewDate = this._calendarDate;
oNewDate.setYear(this._calendarDate.getYear() + 1);
@@ -367,6 +381,10 @@ class Calendar extends WebComponent {
}
_showPrevYear() {
+ if (this._calendarDate.getYear() === YearPicker._MIN_YEAR) {
+ return;
+ }
+
const oNewDate = this._calendarDate;
oNewDate.setYear(this._calendarDate.getYear() - 1);
@@ -374,18 +392,30 @@ class Calendar extends WebComponent {
}
_showNextPageYears() {
+ if (!this._isYearInRange(this._yearPicker.timestamp,
+ YearPicker._ITEMS_COUNT - YearPicker._MIDDLE_ITEM_INDEX,
+ YearPicker._MIN_YEAR,
+ YearPicker._MAX_YEAR)) {
+ return;
+ }
+
this._yearPicker = Object.assign({}, this._yearPicker, {
- // add 20 years to the timestamp of the monthpicker
- timestamp: this._yearPicker.timestamp + (31536000 * 20),
+ timestamp: this._yearPicker.timestamp + (31536000 * YearPicker._ITEMS_COUNT),
});
this._isShiftingYears = true;
}
_showPrevPageYears() {
+ if (!this._isYearInRange(this._yearPicker.timestamp,
+ -YearPicker._MIDDLE_ITEM_INDEX - 1,
+ YearPicker._MIN_YEAR,
+ YearPicker._MAX_YEAR)) {
+ return;
+ }
+
this._yearPicker = Object.assign({}, this._yearPicker, {
- // subtracts 20 years from the timestamp of the monthpicker
- timestamp: this._yearPicker.timestamp - (31536000 * 20),
+ timestamp: this._yearPicker.timestamp - (31536000 * YearPicker._ITEMS_COUNT),
});
this._isShiftingYears = true;
@@ -436,6 +466,16 @@ class Calendar extends WebComponent {
this._oMonth._hidden = false;
}
+ _isYearInRange(timestamp, yearsoffset, min, max) {
+ if (timestamp) {
+ const oCalDate = CalendarDate.fromTimestamp(timestamp * 1000, this._primaryCalendarType);
+ oCalDate.setMonth(0);
+ oCalDate.setDate(1);
+ oCalDate.setYear(oCalDate.getYear() + yearsoffset);
+ return oCalDate.getYear() >= min && oCalDate.getYear() <= max;
+ }
+ }
+
static get calculateTemplateContext() {
return CalendarTemplateContext.calculate;
}
diff --git a/packages/main/src/DatePicker.js b/packages/main/src/DatePicker.js
index b06b8bf02d5e..bac1e7aa5be4 100644
--- a/packages/main/src/DatePicker.js
+++ b/packages/main/src/DatePicker.js
@@ -464,6 +464,11 @@ class DatePicker extends WebComponent {
}
_changeCalendarSelection() {
+ if (this._calendarDate.getYear() < 1) {
+ // 0 is a valid year, but we cannot display it
+ return;
+ }
+
const oCalDate = this._calendarDate;
const timestamp = oCalDate.valueOf() / 1000;
diff --git a/packages/main/src/DayPicker.hbs b/packages/main/src/DayPicker.hbs
index 6f46845d06b9..85620c1b3d9b 100644
--- a/packages/main/src/DayPicker.hbs
+++ b/packages/main/src/DayPicker.hbs
@@ -22,25 +22,29 @@
{{#each ctr._weeks}}
-
- {{#each this}}
-
-
- {{this.iDay}}
-
-
- {{/each}}
-
+ {{#if this.length}}
+
+ {{#each this}}
+
+
+ {{this.iDay}}
+
+
+ {{/each}}
+
+ {{else}}
+
+ {{/if}}
{{/each}}