diff --git a/packages/main/src/DayPicker.js b/packages/main/src/DayPicker.js
index 3ed49ea1830f..600472569321 100644
--- a/packages/main/src/DayPicker.js
+++ b/packages/main/src/DayPicker.js
@@ -807,8 +807,14 @@ class DayPicker extends UI5Element {
_isOutOfSelectableRange(date) {
const currentDate = date._oUDate ? date.toLocalJSDate() : CalendarDate.fromTimestamp(date).toLocalJSDate();
+ const minDate = this._minDateObject;
+ const maxDate = this._maxDateObject;
- return currentDate > this._maxDateObject || currentDate < this._minDateObject;
+ currentDate.setHours(0);
+ minDate.setHours(0);
+ maxDate.setHours(0);
+
+ return currentDate > maxDate || currentDate < minDate;
}
get _maxDate() {
diff --git a/packages/main/test/pages/DatePicker.html b/packages/main/test/pages/DatePicker.html
index ff7ac7593dd7..293e4bcee67a 100644
--- a/packages/main/test/pages/DatePicker.html
+++ b/packages/main/test/pages/DatePicker.html
@@ -110,7 +110,7 @@
2 months range
3 months range
1 year range
-
+
Test ariaLabel and ariaLabelledBy
diff --git a/packages/main/test/specs/DatePicker.spec.js b/packages/main/test/specs/DatePicker.spec.js
index 9adccf49945f..e9e37e4a2a53 100644
--- a/packages/main/test/specs/DatePicker.spec.js
+++ b/packages/main/test/specs/DatePicker.spec.js
@@ -726,6 +726,16 @@ describe("Date Picker Tests", () => {
assert.ok(datepicker.getDisplayedDay(14).isFocusedDeep(), "Days out of range are disabled");
});
+ it("Min and Max date are included in the interval", () => {
+ datepicker.id = "#dp33";
+
+ datepicker.root.keys("Escape");
+ datepicker.openPicker({ focusInput: false });
+
+ assert.equal(datepicker.getDisplayedDay(9).hasClass("ui5-dp-item--disabled"), false , "Min date is included");
+ assert.equal(datepicker.getDisplayedDay(11).hasClass("ui5-dp-item--disabled"), false, "Max date is included");
+ });
+
it("Tests week numbers column visibility", () => {
// act
datepicker.id = "#dp18";