fix(ui5-time-picker): support relative value "now" (#7325)

* fix(ui5-time-picker): support relative value "now"
SAP · Jul 25, 2023 · 0b2ef4f · 0b2ef4f
1 parent d6aeb0f
commit 0b2ef4f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/packages/main/src/TimePicker.ts b/packages/main/src/TimePicker.ts
@@ -115,6 +115,10 @@ class TimePicker extends TimePickerBase {
 	@property()
 	formatPattern!: string;
 
+	onBeforeRendering() {
+		this.value = this.normalizeValue(this.value!) || this.value;
+	}
+
 	get _formatPattern() {
 		const hasHours = !!this.formatPattern.match(/H/i);
 		const fallback = !this.formatPattern || !hasHours;

diff --git a/packages/main/test/pages/TimePicker.html b/packages/main/test/pages/TimePicker.html
@@ -42,6 +42,9 @@
 		<ui5-time-picker id="timepickerInput"></ui5-time-picker>
 		<ui5-input id="inputResult"></ui5-input>
 
+		<br /><br />
+		<ui5-title>Test "now" value</ui5-title>
+		<ui5-time-picker id="timepickerNow" value="now"></ui5-time-picker>
 
 		<br /><br />
 		<ui5-title>Test empty value</ui5-title>

diff --git a/packages/main/test/specs/TimePicker.spec.js b/packages/main/test/specs/TimePicker.spec.js
@@ -215,4 +215,17 @@ describe("TimePicker general interaction", () => {
 		assert.notOk(await timepickerPopover.isDisplayed(), "the picker should be collapsed");
 	});
 
+	it("the value 'now' returns the current time, instead of the string 'now'", async () => {
+		await browser.url(`test/pages/TimePicker.html`);
+
+		const timepicker = await browser.$("#timepicker");
+
+		// act
+		await timepicker.click();
+		await browser.keys("now");
+		await browser.keys("Enter");
+
+		// assert that the value in the input is different than the string 'now'
+		assert.notStrictEqual(await timepicker.shadow$("ui5-input").getProperty("value"), "now", "the value is not 'now'");
+	});
 });