fix(ui5-daypicker): show correct today (#1157)

MapTo0 · web-flow · commit 6fb1dd6e7c71 · 2020-01-28T19:53:52.000+02:00
diff --git a/packages/base/src/dates/CalendarDate.js b/packages/base/src/dates/CalendarDate.js
@@ -149,7 +149,7 @@ class CalendarDate {
 		function isValidDate(date) {
 			return date && Object.prototype.toString.call(date) === "[object Date]" && !isNaN(date); // eslint-disable-line
 		}
-		if (!isValidDate()) {
+		if (!isValidDate(oJSDate)) {
 			throw new Error(`Date parameter must be a JavaScript Date object: [${oJSDate}].`);
 		}
 		return new CalendarDate(oJSDate.getFullYear(), oJSDate.getMonth(), oJSDate.getDate(), sCalendarType);
diff --git a/packages/main/src/DayPicker.js b/packages/main/src/DayPicker.js
@@ -174,9 +174,7 @@ class DayPicker extends UI5Element {
 				lastWeekNumber = weekNumber;
 			}
 
-			const isToday = (oCalDate.getDate() === this._currentCalendarDate.getDate())
-				&& (oCalDate.getMonth() === this._currentCalendarDate.getMonth())
-				&& (oCalDate.getYear() === this._currentCalendarDate.getYear());
+			const isToday = oCalDate.isSame(CalendarDate.fromLocalJSDate(new Date(), this._primaryCalendarType));
 
 			week.push(day);
 
diff --git a/packages/main/test/pages/i18n-demo.html b/packages/main/test/pages/i18n-demo.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+	<script>delete Document.prototype.adoptedStyleSheets;</script>
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta charset="utf-8">
+	<title>i18n Demo</title>
+
+	<script src="../../webcomponentsjs/webcomponents-loader.js"></script>
+	<script src="../../resources/bundle.esm.js" type="module"></script>
+	<script nomodule src="../../resources/bundle.es5.js"></script>
+
+	<script>delete Document.prototype.adoptedStyleSheets;</script>
+
+</head>
+
+
+<body>
+
+	<style>
+		.snippet {
+			display: flex;
+			width: 50%;
+			flex-direction: column;
+			margin: auto;
+			margin-top: 200px;
+		}
+	</style>
+
+	<div class="snippet">
+
+		<ui5-datepicker></ui5-datepicker>
+
+		<br>
+		<br>
+
+		<!-- <ui5-daypicker></ui5-daypicker> -->
+
+
+		<br>
+		<br>
+
+		<ui5-textarea maxlength="20" show-exceeded-text></ui5-textarea>
+
+		<br>
+		<br>
+
+		<span>Martin's cheat sheet</span>
+
+		<hr>
+		mañana, ayer
+	</div>
+</body>
+
+</html>

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class CalendarDate {`
`149`	`149`	`function isValidDate(date) {`
`150`	`150`	`return date && Object.prototype.toString.call(date) === "[object Date]" && !isNaN(date); // eslint-disable-line`
`151`	`151`	`}`
`152`		`- if (!isValidDate()) {`
	`152`	`+ if (!isValidDate(oJSDate)) {`
`153`	`153`	throw new Error(`Date parameter must be a JavaScript Date object: [${oJSDate}].`);
`154`	`154`	`}`
`155`	`155`	`return new CalendarDate(oJSDate.getFullYear(), oJSDate.getMonth(), oJSDate.getDate(), sCalendarType);`
Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,7 @@ class DayPicker extends UI5Element {`
`174`	`174`	`lastWeekNumber = weekNumber;`
`175`	`175`	`}`
`176`	`176`
`177`		`- const isToday = (oCalDate.getDate() === this._currentCalendarDate.getDate())`
`178`		`- && (oCalDate.getMonth() === this._currentCalendarDate.getMonth())`
`179`		`- && (oCalDate.getYear() === this._currentCalendarDate.getYear());`
	`177`	`+ const isToday = oCalDate.isSame(CalendarDate.fromLocalJSDate(new Date(), this._primaryCalendarType));`
`180`	`178`
`181`	`179`	`week.push(day);`
`182`	`180`