@openui5/sap.ui.core 1.112.2 → 1.113.0

package/src/sap/ui/core/UIComponent.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Component
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @alias sap.ui.core.UIComponent
 	 * @since 1.9.2
 	 */
@@ -426,7 +426,8 @@ sap.ui.define([
 	function getConstructorFunctionFor (vRoutingObjectConstructor) {
 		var fnConstructor;
 		if (typeof vRoutingObjectConstructor === "string") {
-			fnConstructor = ObjectPath.get(vRoutingObjectConstructor);
+			fnConstructor = sap.ui.require(vRoutingObjectConstructor.replace(/\./g, "/"))
+				|| ObjectPath.get(vRoutingObjectConstructor);
 			if (!fnConstructor) {
 				Log.error("The specified class for router or targets '" + vRoutingObjectConstructor + "' is undefined.", this);
 			}

package/src/sap/ui/core/UIComponentMetadata.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ComponentMetadata', 'sap/ui/core/mvc/ViewType'],
 	 * @experimental Since 1.15.1. The Component concept is still under construction, so some implementation details can be changed in future.
 	 * @class
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @since 1.15.1
 	 * @alias sap.ui.core.UIComponentMetadata
 	 * @extends sap.ui.core.ComponentMetadata

package/src/sap/ui/core/ValueStateSupport.js

@@ -16,7 +16,7 @@ sap.ui.define(['./Element', './library', './Lib', "sap/base/assert"],
 		 * Helper functionality for value state support.
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.113.0
 		 * @public
 		 * @namespace sap.ui.core.ValueStateSupport
 		 */

package/src/sap/ui/core/VariantLayoutData.js

@@ -20,7 +20,7 @@ sap.ui.define(['./LayoutData', './library'],
 	 * @class
 	 * Allows to add multiple LayoutData to one control in case that an easy switch of layouts (e.g. in a Form) is needed.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @since 1.9.2

package/src/sap/ui/core/XMLComposite.js

@@ -146,7 +146,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.112.2
+		 * @version 1.113.0
 		 * @since 1.56.0
 		 * @alias sap.ui.core.XMLComposite
 		 * @see {@link topic:b83a4dcb7d0e46969027345b8d32fd44 XML Composite Controls}

package/src/sap/ui/core/XMLCompositeMetadata.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @param {object} oClassInfo static info to construct the metadata from
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @since 1.50.0
 	 * @alias sap.ui.core.XMLCompositeMetadata
 	 * @extends sap.ui.core.ElementMetadata

package/src/sap/ui/core/cache/CacheManager.js

@@ -24,7 +24,7 @@ sap.ui.define([
 		 *  <li>Google Chrome(version >=49) for desktop</li>
 		 *  <li>Internet Explorer(version >=11) for desktop.</li>
 		 * </ul>
-		 * For all other environments a dummy (NOP) implementation will be loaded (@see sap.ui.core.cache.CacheManagerNOP).
+		 * For all other environments, a dummy (NOP) implementation will be loaded, see {@link sap.ui.core.cache.CacheManagerNOP}.
 		 *
 		 * This object is not meant for application developer's use, but for core UI5 framework purposes.
 		 *

package/src/sap/ui/core/cache/LRUPersistentCache.js

@@ -16,7 +16,7 @@ sap.ui.define(["sap/base/Log", "sap/ui/performance/Measurement", "sap/ui/Global"
 		 * This implementation works with entries corresponding to a single ui5 version.
 		 * If the cache is loaded with different ui5 version, all previous entries will be deleted. The latter behavior is about of a further changes (feature requests)
 		 *
-		 * This implementation relies on existing configuration @see sap.ui.core.Configuration.
+		 * This implementation relies on existing configuration {@link sap.ui.core.Configuration}.
 		 *
 		 * Do not use it directly, use {@link sap.ui.core.cache.CacheManager} instead
 		 * @private

package/src/sap/ui/core/date/CalendarUtils.js

@@ -9,28 +9,9 @@ sap.ui.define([
 	"sap/ui/core/date/CalendarWeekNumbering",
 	"sap/ui/core/Configuration",
 	"sap/ui/core/LocaleData"
-], function(
-	CalendarWeekNumbering,
-	Configuration,
-	LocaleData
-) {
+], function(CalendarWeekNumbering, Configuration, LocaleData) {
 	"use strict";
 
-	var mWeekNumberingConfiguration = {
-			ISO_8601 : {
-				firstDayOfWeek : 1,
-				minimalDaysInFirstWeek : 4
-			},
-			MiddleEastern : {
-				firstDayOfWeek : 6,
-				minimalDaysInFirstWeek : 1
-			},
-			WesternTraditional : {
-				firstDayOfWeek : 0,
-				minimalDaysInFirstWeek : 1
-			}
-		};
-
 	/**
 	 * Provides calendar-related utilities.
 	 *
@@ -52,8 +33,11 @@ sap.ui.define([
 		 *   which define the first calendar week</li>
 		 * </ul>
 		 *
-		 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering=Default]
-		 *   The calendar week numbering; if omitted, <code>Default</code> is used.
+		 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering]
+		 *   The calendar week numbering; if omitted, the calendar week numbering of the Configuration
+		 *   is used; see {@link sap.ui.core.Configuration#getCalendarWeekNumbering}. If this value is
+		 *   <code>Default</code> the returned calendar week configuration is derived from the given
+		 *   <code>oLocale</code>.
 		 * @param {sap.ui.core.Locale} [oLocale]
 		 *   The locale to use; if not provided, this falls back to the format locale from the
 		 *   Configuration; see {@link sap.ui.core.Configuration.FormatSettings#getFormatLocale}.
@@ -65,12 +49,16 @@ sap.ui.define([
 		 * @since 1.108.0
 		 */
 		getWeekConfigurationValues : function (sCalendarWeekNumbering, oLocale) {
-			var oLocaleData;
+			var oLocaleData, oWeekConfigurationValues;
+
+			if (!sCalendarWeekNumbering) {
+				return CalendarUtils.getWeekConfigurationValues(Configuration.getCalendarWeekNumbering(), oLocale);
+			}
 
-			if (mWeekNumberingConfiguration.hasOwnProperty(sCalendarWeekNumbering)) {
-				return mWeekNumberingConfiguration[sCalendarWeekNumbering];
+			oWeekConfigurationValues = CalendarWeekNumbering.getWeekConfigurationValues(sCalendarWeekNumbering);
+			if (oWeekConfigurationValues) {
+				return oWeekConfigurationValues;
 			}
-			sCalendarWeekNumbering = sCalendarWeekNumbering || CalendarWeekNumbering.Default;
 			if (sCalendarWeekNumbering === CalendarWeekNumbering.Default) {
 				oLocale = oLocale || Configuration.getFormatSettings().getFormatLocale();
 				oLocaleData = LocaleData.getInstance(oLocale);

package/src/sap/ui/core/date/CalendarWeekNumbering.js

@@ -69,5 +69,37 @@ sap.ui.define([], function() {
 		WesternTraditional : "WesternTraditional"
 	};
 
+	/**
+	 * Returns an object containing the week configuration values for the given calendar week
+	 * numbering algorithm.
+	 *
+	 * @param {sap.ui.core.date.CalendarWeekNumbering} [sCalendarWeekNumbering=Default]
+	 *   The calendar week numbering algorithm
+	 * @returns {{firstDayOfWeek: int, minimalDaysInFirstWeek: int}|undefined}
+	 *   The week configuration values or <code>undefined</code> if the given calendar week
+	 *   numbering algorithm is "Default"
+	 *
+	 * @function
+	 * @name sap.ui.core.date.CalendarWeekNumbering.getWeekConfigurationValues
+	 * @private
+	 */
+	Object.defineProperty(CalendarWeekNumbering, "getWeekConfigurationValues", {
+		// configurable : false,
+		// enumerable : false,
+		value : function (sCalendarWeekNumbering) {
+			switch (sCalendarWeekNumbering) {
+				case CalendarWeekNumbering.ISO_8601 :
+					return {firstDayOfWeek : 1, minimalDaysInFirstWeek : 4};
+				case CalendarWeekNumbering.MiddleEastern :
+					return {firstDayOfWeek : 6, minimalDaysInFirstWeek : 1};
+				case CalendarWeekNumbering.WesternTraditional :
+					return {firstDayOfWeek : 0, minimalDaysInFirstWeek : 1};
+				default:
+					return undefined;
+			}
+		}
+		// writable : false
+	});
+
 	return CalendarWeekNumbering;
 }, /* bExport= */ true);

package/src/sap/ui/core/date/UI5Date.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.111.0
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 */
 	function UI5Date(vDateParts, sTimezoneID) {
 		var oDateInstance = UI5Date._createDateInstance(vDateParts);

package/src/sap/ui/core/date/UniversalDateUtils.js

@@ -391,11 +391,11 @@ sap.ui.define([
 		 */
 		 UniversalDateUtils._getDateFromWeekStartByDayOffset = function (sCalendarWeekNumbering, iDaysToAdd) {
 			var sCalendarType = Configuration.getCalendarType(),
-				oLocale = new Locale(Configuration.getFormatLocale()),
+				oLocale = Configuration.getFormatSettings().getFormatLocale(),
 				oUniversalDate = UniversalDateUtils.createNewUniversalDate(),
-				iWeek = oUniversalDate.getWeek().week,
-				iYear = oUniversalDate.getWeek().year,
-				oFirstDateOfWeek = UniversalDate.getFirstDateOfWeek(sCalendarType, iYear, iWeek, oLocale, sCalendarWeekNumbering);
+				oWeekAndYear = oUniversalDate.getWeek(oLocale, sCalendarWeekNumbering),
+				oFirstDateOfWeek = UniversalDate.getFirstDateOfWeek(sCalendarType, oWeekAndYear.year, oWeekAndYear.week,
+						oLocale, sCalendarWeekNumbering);
 
 			if (iDaysToAdd === undefined) {
 				iDaysToAdd = 0;

package/src/sap/ui/core/date/_Calendars.js

@@ -17,7 +17,7 @@ sap.ui.define([], function () {
 	var _Calendars = {
 		get: function (sCalendarType) {
 			if (!mRegistry.has(sCalendarType)) {
-				sap.ui.requireSync("sap/ui/core/date/" + sCalendarType);
+				sap.ui.requireSync("sap/ui/core/date/" + sCalendarType); // TODO: establish full async alternative
 			}
 
 			return mRegistry.get(sCalendarType);

package/src/sap/ui/core/delegate/ItemNavigation.js

@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @param {Element[]} aItemDomRefs Array of DOM references representing the items for the navigation
 	 * @param {boolean} [bNotInTabChain=false] Whether the selected element should be in the tab chain or not
 	 *
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @alias sap.ui.core.delegate.ItemNavigation
 	 * @public
 	 */

package/src/sap/ui/core/delegate/ScrollEnablement.js

@@ -58,7 +58,7 @@ sap.ui.define([
 		 *
 		 * @protected
 		 * @alias sap.ui.core.delegate.ScrollEnablement
-		 * @version 1.112.2
+		 * @version 1.113.0
 		 * @author SAP SE
 		 */
 		var ScrollEnablement = BaseObject.extend("sap.ui.core.delegate.ScrollEnablement", /** @lends sap.ui.core.delegate.ScrollEnablement.prototype */ {

package/src/sap/ui/core/dnd/DragDropBase.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragDropInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragInfo", "./DropInfo", "sap/base/Log"],
 	 * @extends sap.ui.core.dnd.DropInfo
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @since 1.52

package/src/sap/ui/core/dnd/DragInfo.js

@@ -22,7 +22,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/dnd/DropInfo.js

@@ -21,7 +21,7 @@ sap.ui.define(["./DragDropBase"],
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @since 1.56

package/src/sap/ui/core/format/DateFormat.js

@@ -250,6 +250,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "Jan 10, 2008...Feb 12, 2008".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "Jan 10 – Feb 12, 2008" becomes "Jan 10, 2008...Feb 12, 2008".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the date is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -288,6 +294,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "Jan 10, 2008, 9:15:00 AM...Jan 10, 2008, 11:45:00 AM".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "Jan 10, 2008, 9:15 – 11:45 AM" becomes "Jan 10, 2008, 9:15 AM...Jan 10, 2008, 11:45 AM".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the date is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -324,7 +336,7 @@ sap.ui.define([
 	 * Format a date object to a string according to the given timezone and format options.
 	 *
 	 * @example <caption>Format option showTimezone: true (default)</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 *
 	 * DateFormat.getDateTimeWithTimezoneInstance().format(oDate, "Europe/Berlin");
 	 * // output: "Dec 24, 2021, 2:37:00 PM Europe, Berlin"
@@ -333,12 +345,12 @@ sap.ui.define([
 	 * // output: "Dec 24, 2021, 8:37:00 AM Americas, New York"
 	 *
 	 * @example <caption>Format option showTimezone: false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showTimezone: false}).format(oDate, "America/New_York");
 	 * // output: "Dec 24, 2021, 8:37:00 AM"
 	 *
 	 * @example <caption>Format option showDate: false and showTime:false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showDate: false, showTime: false}).format(oDate, "America/New_York");
 	 * // output: "Americas, New York"
 	 *
@@ -359,7 +371,7 @@ sap.ui.define([
 	 * containing a date object and the timezone.
 	 *
 	 * @example <caption>Format option showTimezone: true (default)</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 *
 	 * DateFormat.getDateTimeWithTimezoneInstance().parse("Dec 24, 2021, 2:37:00 PM Europe, Berlin", "Europe/Berlin");
 	 * // output: [oDate, "Europe/Berlin"]
@@ -368,7 +380,7 @@ sap.ui.define([
 	 * // output: [oDate, "America/New_York"]
 	 *
 	 * @example <caption>Format option showTimezone: false</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeWithTimezoneInstance({showTimezone: false}).parse("Dec 24, 2021, 8:37:00 AM", "America/New_York");
 	 * // output: [oDate, undefined]
 	 *
@@ -394,9 +406,12 @@ sap.ui.define([
 	 * <ul>
 	 *   <li>An array containing datetime and timezone depending on the showDate, showTime and showTimezone options
 	 *     <ul>
-	 *         <li>(Default): [Date, string], e.g. [new Date("2021-11-13T13:22:33Z"), "America/New_York"]</li>
-	 *         <li><code>showTimezone: false</code>: [Date, undefined], e.g. [new Date("2021-11-13T13:22:33Z"), undefined]</li>
-	 *         <li><code>showDate: false, showTime: false</code>: [undefined, string], e.g. [undefined, "America/New_York"]</li>
+	 *         <li>(Default): [Date, string], e.g.
+	 *           [UI5Date.getInstance("2021-11-13T13:22:33Z"), "America/New_York"]</li>
+	 *         <li><code>showTimezone: false</code>: [Date, undefined], e.g.
+	 *           [UI5Date.getInstance("2021-11-13T13:22:33Z"), undefined]</li>
+	 *         <li><code>showDate: false, showTime: false</code>: [undefined, string], e.g.
+	 *           [undefined, "America/New_York"]</li>
 	 *     </ul>
 	 *   </li>
 	 * </ul>
@@ -406,6 +421,8 @@ sap.ui.define([
 	 * @function
 	 * @since 1.99
 	 */
+	// This method has a TypeScript specific overlay for a better return value documentation,
+	// see 'src/sap.ui.core/.dtsgenrc'
 
 	/**
 	 * Get a datetimeWithTimezone instance of the DateFormat, which can be used for formatting.
@@ -493,6 +510,12 @@ sap.ui.define([
 	 * @param {string} [oFormatOptions.relativeStyle="wide"] since 1.32.10, 1.34.4 the style of the relative format. The valid values are "wide", "short", "narrow"
 	 * @param {boolean} [oFormatOptions.interval=false] since 1.48.0 if true, the {@link sap.ui.core.format.DateFormat#format format} method expects an array with two dates as the first argument and formats them as interval. Further interval "Jan 10, 2008 - Jan 12, 2008" will be formatted as "Jan 10-12, 2008" if the 'format' option is set with necessary symbols.
 	 *   Otherwise the two given dates are formatted separately and concatenated with local dependent pattern.
+	 * @param {string} [oFormatOptions.intervalDelimiter]
+	 *   Since 1.113.0, a delimiter for intervals. With a given interval delimiter a specific interval format is
+	 *   created. <b>Example:</b> If <code>oFormatOptions.intervalDelimiter</code> is set to "...", an interval would be
+	 *   given as "09:15 AM...11:45 AM".
+	 *   <b>Note:</b> If this format option is set, the locale-specific interval notation is overruled, for example
+	 *   "09:15 – 11:45 AM" becomes "9:15 AM...11:45 AM".
 	 * @param {boolean} [oFormatOptions.singleIntervalValue=false] Only relevant if oFormatOptions.interval is set to 'true'. This allows to pass an array with only one date object to the {@link sap.ui.core.format.DateFormat#format format} method.
 	 * @param {boolean} [oFormatOptions.UTC] if true, the time is formatted and parsed as UTC instead of the local timezone
 	 * @param {sap.ui.core.CalendarType} [oFormatOptions.calendarType] The calender type which is used to format and parse the date. This value is by default either set in configuration or calculated based on current locale.
@@ -595,6 +618,8 @@ sap.ui.define([
 		}
 
 		if (oFormat.oFormatOptions.interval) {
+			var sSinglePattern,
+				sDelimiter = oFormat.oFormatOptions.intervalDelimiter;
 
 			if (oFormat.oFormatOptions.format) {
 				// when 'format' option is set, generate the pattern based on the greatest difference
@@ -605,10 +630,14 @@ sap.ui.define([
 					oFormat.intervalPatterns = [oFormat.intervalPatterns];
 				}
 
-				// Put the single date pattern, which is generated based on the oFormatOptions.format, into the array in case the date interval is formatted as a single date
-				oFormat.intervalPatterns.push(oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format, oFormat.oFormatOptions.calendarType));
+				sSinglePattern = oFormat.oLocaleData.getCustomDateTimePattern(oFormat.oFormatOptions.format,
+					oFormat.oFormatOptions.calendarType);
+				// Put the single date pattern, which is generated based on the oFormatOptions.format, into the array in
+				// case the date interval is formatted as a single date
+				oFormat.intervalPatterns.push(sSinglePattern);
 
 			} else {
+				sSinglePattern = oFormat.oFormatOptions.pattern;
 				oFormat.intervalPatterns = [
 					// when 'format' option is not set, generate the combined interval pattern
 					oFormat.oLocaleData.getCombinedIntervalPattern(oFormat.oFormatOptions.pattern, oFormat.oFormatOptions.calendarType),
@@ -618,6 +647,12 @@ sap.ui.define([
 			}
 			var sCommonConnectorPattern = createIntervalPatternWithNormalConnector(oFormat);
 			oFormat.intervalPatterns.push(sCommonConnectorPattern);
+			if (sDelimiter) { // use delimiter pattern as first choice
+				sDelimiter = sDelimiter.replace(/'/g, "''");
+				sDelimiter = "'" + sDelimiter + "'";
+				oFormat.intervalPatterns.unshift(sSinglePattern + sDelimiter + sSinglePattern);
+			}
+			oFormat.intervalPatterns = Array.from(new Set(oFormat.intervalPatterns));
 		}
 
 		// if the current format isn't a fallback format, create its fallback formats
@@ -2305,7 +2340,7 @@ sap.ui.define([
 	 * {@link sap.ui.core.format.DateFormat.getDateTimeWithTimezoneInstance#format}.
 	 *
 	 * @example <caption>DateTime (assuming timezone "Europe/Berlin")</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeInstance().format(oDate);
 	 * // output: "Dec 24, 2021, 2:37:00 PM"
 	 *
@@ -2399,27 +2434,55 @@ sap.ui.define([
 		return sResult;
 	};
 
-	DateFormat.prototype._formatInterval = function(aJSDates, bUTC) {
-		var sCalendarType = this.oFormatOptions.calendarType;
-		var oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType);
-		var oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType);
-		var oDate;
-		var oPart;
-		var sSymbol;
-		var aBuffer = [];
-		var sPattern;
-		var aFormatArray = [];
+	/**
+	 * Checks whether the interval to be formatted has to use the pattern of a custom interval delimiter.
+	 *
+	 * @param {object} oDiffFields
+	 *   An object describing which date information is required for this instance's interval format,
+	 *   for example <code>{"Day": true, "Minutes": true}</code>
+	 * @returns {boolean}
+	 *   Whether to use the custom interval delimiter pattern
+	 *
+	 * @private
+	 */
+	DateFormat.prototype._useCustomIntervalDelimiter = function (oDiffFields) {
+		var aTokens;
+
+		if (!this.oFormatOptions.intervalDelimiter) {
+			return false;
+		}
+		// If there are no differences in the date/time parts specified by "oFormatOptions.format", a single value is
+		// formatted and there is no need to use the custom delimiter pattern.
+		if (this.oFormatOptions.format) {
+			aTokens = this.oLocaleData._parseSkeletonFormat(this.oFormatOptions.format);
 
-		var oDiffField = this._getGreatestDiffField([oFromDate, oToDate]);
+			return aTokens.some(function (oToken) {
+				return oDiffFields[oToken.group];
+			});
+		}
 
-		if (!oDiffField) {
+		return true;
+	};
+
+	DateFormat.prototype._formatInterval = function(aJSDates, bUTC) {
+		var oDate, oPart, sPattern, sSymbol,
+			aBuffer = [],
+			sCalendarType = this.oFormatOptions.calendarType,
+			aFormatArray = [],
+			oFromDate = UniversalDate.getInstance(aJSDates[0], sCalendarType),
+			oToDate = UniversalDate.getInstance(aJSDates[1], sCalendarType),
+			oDiffFields = this._getDiffFields([oFromDate, oToDate]);
+
+		if (!oDiffFields) {
 			return this._format(aJSDates[0], bUTC);
 		}
 
-		if (this.oFormatOptions.format) {
+		if (this._useCustomIntervalDelimiter(oDiffFields)) {
+			sPattern = this.intervalPatterns[0];
+		} else if (this.oFormatOptions.format) {
 			// when 'format' option is set, generate the pattern based on the greatest difference
-			sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffField, sCalendarType);
-
+			sPattern = this.oLocaleData.getCustomIntervalPattern(this.oFormatOptions.format, oDiffFields,
+				sCalendarType);
 		} else {
 			sPattern = this.oLocaleData.getCombinedIntervalPattern(this.oFormatOptions.pattern, sCalendarType);
 		}
@@ -2454,8 +2517,18 @@ sap.ui.define([
 		Seconds: "Second"
 	};
 
-	// the expected dates are UTC and therefore their UTC functions are called, e.g. getUTCHours
-	DateFormat.prototype._getGreatestDiffField = function(aDates) {
+	/**
+	 * Returns an object containing the relevant date/time parts that differ in the two given dates.
+	 *
+	 * @param {sap.ui.core.date.UniversalDate[]} aDates
+	 *   An array with two UniversalDate instances representing the start and the end date of the interval;
+	 *   the dates are expected to be in UTC time zone
+	 * @returns {Object<string, boolean>|null}
+	 *   An object containing the different date/time parts, or <code>null</code> if the dates are the same
+	 *
+	 * @private
+	 */
+	DateFormat.prototype._getDiffFields = function(aDates) {
 		var bDiffFound = false,
 			mDiff = {};
 
@@ -2709,7 +2782,7 @@ sap.ui.define([
 		}
 		if (oDateValue.tzDiff) {
 			// tzDiff is in seconds for a higher precision (historical timezone might have differences in seconds)
-			// e.g. new Date(Date.UTC(1730, 0, 1))
+			// e.g. UI5Date.getInstance("1730-01-01T00:00:00Z")
 			// is in Berlin: Sun Jan 01 1730 00:53:28 GMT+0053 (Central European Standard Time)
 			oDate.setUTCSeconds(oDate.getUTCSeconds() + oDateValue.tzDiff);
 		}
@@ -2764,7 +2837,7 @@ sap.ui.define([
 	 * {@link sap.ui.core.format.DateFormat.getDateTimeWithTimezoneInstance#parse}.
 	 *
 	 * @example <caption>DateTime (assuming timezone "Europe/Berlin")</caption>
-	 * var oDate = new Date(Date.UTC(2021, 11, 24, 13, 37));
+	 * var oDate = UI5Date.getInstance("2021-12-24T13:37:00Z");
 	 * DateFormat.getDateTimeInstance().parse("Dec 24, 2021, 2:37:00 PM");
 	 * // output: oDate
 	 *

package/src/sap/ui/core/format/NumberFormat.js

@@ -1479,7 +1479,9 @@ sap.ui.define([
 
 		if (oOptions.type === mNumberType.UNIT && !oOptions.showNumber) {
 			if (mUnitPatterns) {
-				sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+				// the plural category of a unit pattern is determined for the complete number, maybe as compact
+				// notation, e.g. "1.2M" must check "1.2c6"
+				sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart, oShortFormat);
 
 				sPattern = mUnitPatterns["unitPattern-count-" + sPluralCategory];
 				if (!sPattern) {
@@ -1525,7 +1527,9 @@ sap.ui.define([
 
 		if (oShortFormat && oShortFormat.formatString && oOptions.showScale && oOptions.type !== mNumberType.CURRENCY) {
 			// Get correct format string based on actual decimal/fraction digits
-			sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+			// the plural category of a compact number is determined for the reduced short number without compact
+			// notation, e.g. "1.2M" must check "1.2" (see CLDR "decimalFormat-short" and "decimalFormat-long")
+			sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart);
 			oShortFormat.formatString = this.oLocaleData.getDecimalFormat(oOptions.style, oShortFormat.key, sPluralCategory);
 			//inject formatted shortValue in the formatString
 			sResult = oShortFormat.formatString.replace(oShortFormat.valueSubString, sResult);
@@ -1548,7 +1552,9 @@ sap.ui.define([
 				}
 
 				// Get correct format string based on actual decimal/fraction digits
-				sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+				// the plural category of a compact currency is determined for the reduced short number without compact
+				// notation, e.g. "1.2M" must check "1.2" (see CLDR "currencyFormat-short")
+				sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart);
 				if (bIndianCurrency) {
 					sPattern = getIndianCurrencyFormat(sStyle, oShortFormat.key, sPluralCategory);
 				} else {
@@ -1602,8 +1608,9 @@ sap.ui.define([
 		}
 
 		if (oOptions.showMeasure && sMeasure && oOptions.type === mNumberType.UNIT) {
-
-			sPluralCategory = this.oLocaleData.getPluralCategory(sIntegerPart + "." + sFractionPart);
+			// the plural category of a unit pattern is determined for the complete number, maybe as compact
+			// notation, e.g. "1.2M" must check "1.2c6"
+			sPluralCategory = this._getPluralCategory(sIntegerPart, sFractionPart, oShortFormat);
 
 			if (mUnitPatterns) {
 				sPattern = mUnitPatterns["unitPattern-count-" + sPluralCategory];
@@ -1622,6 +1629,34 @@ sap.ui.define([
 		return this._addOriginInfo(sResult);
 	};
 
+	/**
+	 * Gets the plural category for the given number information. With a given <code>oShortFormat</code>
+	 * the category is determined based on the compact notation.
+	 *
+	 * @param {int} sIntegerPart
+	 *   The integer part
+	 * @param {int} [sFractionPart]
+	 *   The fraction part
+	 * @param {{magnitude: int}} [oShortFormat]
+	 *   An object containing the <code>magnitude</code> information describing the factor of a compact number
+	 * @returns {string}
+	 *   The plural category
+	 *
+	 * @private
+	 */
+	NumberFormat.prototype._getPluralCategory = function (sIntegerPart, sFractionPart, oShortFormat) {
+		var sNumber = sIntegerPart;
+
+		if (sFractionPart) {
+			sNumber += "." + sFractionPart;
+		}
+		if (oShortFormat) {
+			sNumber += "c" + oShortFormat.magnitude.toExponential().slice(2);
+		}
+
+		return this.oLocaleData.getPluralCategory(sNumber);
+	};
+
 	NumberFormat.prototype._addOriginInfo = function(sResult) {
 		if (Configuration.getOriginInfo()) {
 			// String object is created on purpose and must not be a string literal

package/src/sap/ui/core/format/TimezoneUtil.js

@@ -11,7 +11,7 @@ sap.ui.define([], function() {
 	 * Static collection of utility functions to handle time zone related conversions
 	 *
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @namespace
 	 * @alias sap.ui.core.format.TimezoneUtil
 	 * @private