From e5051ea70af8c470f53788a7b13a2fb3f8c3f123 Mon Sep 17 00:00:00 2001 From: Tsanislav Gatev Date: Tue, 21 May 2024 18:31:19 +0300 Subject: [PATCH] fix(ui5-datetime-picker): change dateformat to datetime instance (#9024) The DateTimePicker was calling an inherited getFormat method, which was creating an instance with getDateInstance method. Now we are using the correct format created with getDateTimeInstance method. --- packages/main/src/DateTimePicker.ts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/packages/main/src/DateTimePicker.ts b/packages/main/src/DateTimePicker.ts index 44ba1403f541..9803b65b9489 100644 --- a/packages/main/src/DateTimePicker.ts +++ b/packages/main/src/DateTimePicker.ts @@ -9,6 +9,7 @@ import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDat import type { IFormInputElement } from "@ui5/webcomponents-base/dist/features/InputElementsFormSupport.js"; import "@ui5/webcomponents-icons/dist/date-time.js"; import UI5Date from "@ui5/webcomponents-localization/dist/dates/UI5Date.js"; +import DateFormat from "@ui5/webcomponents-localization/dist/DateFormat.js"; import Button from "./Button.js"; import type ResponsivePopover from "./ResponsivePopover.js"; import ToggleButton from "./ToggleButton.js"; @@ -396,6 +397,20 @@ class DateTimePicker extends DatePicker implements IFormInputElement { return selectedDate; } + getFormat() { + return this._isPattern + ? DateFormat.getDateTimeInstance({ + strictParsing: true, + pattern: this._formatPattern, + calendarType: this._primaryCalendarType, + }) + : DateFormat.getDateTimeInstance({ + strictParsing: true, + style: this._formatPattern, + calendarType: this._primaryCalendarType, + }); + } + /** * @override */