fix(ui5-date-picker): adjust timestamp (#9355)

Fixes: #9217
SAP · Jul 30, 2024 · b72ed21 · b72ed21
1 parent f887689
commit b72ed21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/packages/main/src/DatePicker.ts b/packages/main/src/DatePicker.ts
@@ -405,6 +405,7 @@ class DatePicker extends DateComponentBase implements IFormInputElement {
 	}
 
 	onResponsivePopoverBeforeOpen() {
+		this._calendar.timestamp = this._calendarTimestamp;
 		this._calendarCurrentPicker = this.firstPicker;
 	}
 
@@ -421,6 +422,11 @@ class DatePicker extends DateComponentBase implements IFormInputElement {
 		this.liveValue = this.value;
 	}
 
+	get _calendar() {
+		return this.shadowRoot!.querySelector<ResponsivePopover>("[ui5-responsive-popover]")!
+			.querySelector<Calendar>("[ui5-calendar]")!;
+	}
+
 	/**
 	 * Override in derivatives to change calendar selection mode
 	 * @protected

diff --git a/packages/main/src/DatePickerPopover.hbs b/packages/main/src/DatePickerPopover.hbs
@@ -44,7 +44,6 @@
 		primary-calendar-type="{{_primaryCalendarType}}"
 		secondary-calendar-type="{{secondaryCalendarType}}"
 		format-pattern="{{_formatPattern}}"
-		timestamp="{{_calendarTimestamp}}"
 		.selectionMode="{{_calendarSelectionMode}}"
 		.minDate="{{minDate}}"
 		.maxDate="{{maxDate}}"

diff --git a/packages/main/src/DateRangePicker.hbs b/packages/main/src/DateRangePicker.hbs
@@ -7,7 +7,6 @@
 		primary-calendar-type="{{_primaryCalendarType}}"
 		secondary-calendar-type="{{secondaryCalendarType}}"
 		format-pattern="{{_formatPattern}}"
-		timestamp="{{_calendarTimestamp}}"
 		.selectionMode="{{_calendarSelectionMode}}"
 		.minDate="{{minDate}}"
 		.maxDate="{{maxDate}}"

diff --git a/packages/main/src/DateTimePickerPopover.hbs b/packages/main/src/DateTimePickerPopover.hbs
@@ -20,7 +20,6 @@
 			primary-calendar-type="{{_primaryCalendarType}}"
 			secondary-calendar-type="{{secondaryCalendarType}}"
 			format-pattern="{{_formatPattern}}"
-			timestamp="{{_calendarTimestamp}}"
 			.selectionMode="{{_calendarSelectionMode}}"
 			.minDate="{{minDate}}"
 			.maxDate="{{maxDate}}"

diff --git a/packages/main/test/specs/DatePicker.spec.js b/packages/main/test/specs/DatePicker.spec.js
@@ -758,8 +758,7 @@ describe("Date Picker Tests", () => {
 		}
 
 		await innerInput.keys("May 5, 2100");
-		const root = await datepicker.getRoot();
-		await root.keys("Enter");
+		await innerInput.keys("Enter");
 
 		const input = await datepicker.getInput();
 		assert.equal(await input.getProperty("valueState"), "Negative", "value state of the input is Negative");