@openui5/sap.ui.core 1.122.1 → 1.123.1

package/src/sap/ui/model/odata/v4/lib/_V2MetadataConverter.js

@@ -345,7 +345,7 @@ sap.ui.define([
 	 * @returns {object} The target for the annotations
 	 */
 	Annotatable.prototype.getTarget = function () {
-		if (!this.mAnnotationsForTarget) {
+		if (!this.mAnnotationsForTarget) { // eslint-disable-line logical-assignment-operators
 			this.mAnnotationsForTarget = this.oConverter.convertedV2Annotations[this.sPath] = {};
 		}
 		return this.mAnnotationsForTarget;
@@ -1465,8 +1465,7 @@ sap.ui.define([
 					oToRole = oAssociation.roles[oAssociationSetTo.roleName];
 
 				if (oToRole.propertyName) {
-					oEntitySet.$NavigationPropertyBinding
-						= oEntitySet.$NavigationPropertyBinding || {};
+					oEntitySet.$NavigationPropertyBinding ??= {};
 					oEntitySet.$NavigationPropertyBinding[oToRole.propertyName]
 						= oAssociationSetTo.entitySetName;
 				}
@@ -1526,7 +1525,7 @@ sap.ui.define([
 	 * @param {object} $$ The prototype for V4MetadataConverter
 	 */
 	(function ($$) {
-		// Note: this function is executed at load time only!
+		// Note: this function is run at load time only!
 		var oStructuredTypeConfig;
 
 		$$.sRootNamespace = sEdmxNamespace;

package/src/sap/ui/model/odata/v4/lib/_V2Requestor.js

@@ -160,13 +160,11 @@ sap.ui.define([
 		if (iPrecision > 0) {
 			sPattern += "." + "".padEnd(iPrecision, "S");
 		}
-		if (!mPattern2Formatter[sPattern]) {
-			mPattern2Formatter[sPattern] = DateFormat.getDateTimeInstance({
+		mPattern2Formatter[sPattern] ??= DateFormat.getDateTimeInstance({
 				calendarType : CalendarType.Gregorian,
 				pattern : sPattern,
 				UTC : true
 			});
-		}
 		// no need to use UI5Date.getInstance as only UTC is relevant
 		return mPattern2Formatter[sPattern].format(new Date(iTicks)) + sOffset;
 	};
@@ -910,15 +908,9 @@ sap.ui.define([
 	 * @private
 	 */
 	_V2Requestor.getTypeForName = function (sName) {
-		var oType;
-
-		this.mTypesByName = this.mTypesByName || {};
-		oType = this.mTypesByName[sName];
-		if (!oType) {
-			oType = this.mTypesByName[sName]
-				= this.oModelInterface.fetchMetadata("/" + sName).getResult();
-		}
-		return oType;
+		this.mTypesByName ??= {};
+		this.mTypesByName[sName] ??= this.oModelInterface.fetchMetadata("/" + sName).getResult();
+		return this.mTypesByName[sName];
 	};
 
 	/**

package/src/sap/ui/model/odata/v4/lib/_V4MetadataConverter.js

@@ -545,7 +545,7 @@ sap.ui.define([
 	 * @param {object} $$ The prototype for V4MetadataConverter
 	 */
 	(function ($$) {
-		// Note: this function is executed at load time only!
+		// Note: this function is run at load time only!
 		var oActionOrFunctionConfig,
 			oEntitySetConfig,
 			oStructuredTypeConfig;

package/src/sap/ui/model/resource/ResourceModel.js

@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Lib", 'sap/ui/model/SimpleType', 'sap/ui/model/Forma
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -8,6 +8,7 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/each",
+	"sap/base/util/extend",
 	"sap/base/util/isEmptyObject",
 	"sap/ui/core/Lib",
 	"sap/ui/core/format/NumberFormat",
@@ -15,7 +16,8 @@ sap.ui.define([
 	"sap/ui/model/FormatException",
 	"sap/ui/model/ParseException",
 	"sap/ui/model/ValidateException"
-], function(Log, each, isEmptyObject, Library, NumberFormat, CompositeType, FormatException, ParseException, ValidateException) {
+], function(Log, each, extend, isEmptyObject, Library, NumberFormat, CompositeType, FormatException, ParseException,
+		ValidateException) {
 	"use strict";
 
 	/**
@@ -32,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -209,11 +211,15 @@ sap.ui.define([
 
 	/**
 	 * Create formatters used by this type
+	 *
 	 * @private
 	 */
-	Currency.prototype._createFormats = function() {
+	Currency.prototype._createFormats = function () {
 		var oSourceOptions = this.oFormatOptions.source;
-		this.oOutputFormat = NumberFormat.getCurrencyInstance(this.oFormatOptions);
+		this.oOutputFormat = NumberFormat.getCurrencyInstance(this.iScale >= 0
+			// ensures that amount scale wins over the decimals for the unit
+			? extend({}, {maxFractionDigits : this.iScale}, this.oFormatOptions)
+			: this.oFormatOptions);
 		if (oSourceOptions) {
 			if (isEmptyObject(oSourceOptions)) {
 				oSourceOptions = {
@@ -276,6 +282,44 @@ sap.ui.define([
 		return [];
 	};
 
+	/**
+	 * Gets the indices of the binding parts of this composite type in order to determine those parts
+	 * whose types are required for formatting.
+	 * If for example the type of the amount part is a {@link sap.ui.model.odata.type.Decimal} with a
+	 * <code>scale</code> constraint less than the currency part's decimal places, then the amount's
+	 * scale is used.
+	 *
+	 * @returns {int[]}
+	 *   The indices of the parts with a relevant type for this composite type, or an empty array if
+	 *   the format option <code>showNumber</code> is <code>false</code>
+	 *
+	 * @override sap.ui.model.CompositeType#getPartsListeningToTypeChanges
+	 * @see #processPartTypes
+	 */
+	Currency.prototype.getPartsListeningToTypeChanges = function () {
+		// Only the first part is of interest because it may have a type with another scale than the
+		// decimal places for the currency part
+		return this.bShowNumber ? [0] : [];
+	};
+
+	/**
+	 * Processes the types of this composite type's parts. Remembers the <code>scale</code>
+	 * constraint of the amount part's type to consider it while formatting.
+	 *
+	 * @param {sap.ui.model.SimpleType[]} aPartTypes The types of the composite binding parts
+	 *
+	 * @override sap.ui.model.CompositeType#processPartTypes
+	 * @protected
+	 * @since 1.123.0
+	 */
+	Currency.prototype.processPartTypes = function (aPartTypes) {
+		const iOldScale = this.iScale;
+		this.iScale = aPartTypes[0]?.oConstraints?.scale;
+		if (iOldScale !== this.iScale) {
+			this._createFormats();
+		}
+	};
+
 	return Currency;
 
 });

package/src/sap/ui/model/type/Date.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @alias sap.ui.model.type.DateInterval
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]
@@ -139,7 +139,7 @@ sap.ui.define([
 
 		if (this.iScale >= 0) {
 			// ensures that amount scale wins over the decimals for the unit
-			oFormatOptionsMerged = extend({}, oFormatOptionsMerged, {maxFractionDigits: this.iScale});
+			oFormatOptionsMerged = extend({}, {maxFractionDigits: this.iScale}, oFormatOptionsMerged);
 		}
 		// Only subclasses of the Unit type use a NumberFormat instance cache.
 		// By default a new NumberFormat instance is created everytime.
@@ -247,14 +247,15 @@ sap.ui.define([
 	};
 
 	/**
-	 * Gets the indices of the binding parts for which this type requires the binding's type for formatting or parsing.
+	 * Gets the indices of the binding parts of this composite type in order to determine those parts
+	 * whose types are required for formatting.
 	 * If for example the type of the amount part is a {@link sap.ui.model.odata.type.Decimal} with a
 	 * <code>scale</scale> constraint less than the unit part's decimal places, then the amount's scale is
 	 * used.
 	 *
 	 * @returns {int[]}
 	 *   The indices of the parts with a relevant type for this composite type, or an empty array if
-	 *   the format option <code>showNumber</code> is falsy
+	 *   the format option <code>showNumber</code> is <code>false</code>
 	 *
 	 * @override sap.ui.model.CompositeType#getPartsListeningToTypeChanges
 	 * @see #processPartTypes

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -10,6 +10,9 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 		function(ElementRegistry, Control, nextUIUpdate) {
 	"use strict";
 
+	/**
+	 * @deprecated As of version 1.120, as sync code loading has been deprecated. The calling context must provide QUnit.
+	 */
 	if ( typeof QUnit === "undefined" ) {
 		sap.ui.requireSync("sap/ui/qunit/qunit-css"); // legacy-relevant - sync fallback when caller did not load QUnit
 		sap.ui.requireSync("sap/ui/thirdparty/qunit"); // legacy-relevant - sync fallback when caller did not load QUnit
@@ -27,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.122.1
+	 * @version 1.123.1
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/ModuleTracking.js

@@ -22,6 +22,7 @@
 	var Log,
 		sClassName = "sap.ui.base.SyncPromise",
 		iNo = 0,
+		rSearchParamWithoutValue = /(=)(?=&|$)/g,
 		mUncaughtById = {},
 		mUncaughtPromise2Reason = new Map();
 
@@ -343,12 +344,57 @@
 					}
 				});
 
+			const oParams = new URLSearchParams(document.location.search);
+
+			// add a button to clear the filter
+			if (oParams.has("filter")) {
+				const oClearFilter = document.createElement("button");
+
+				oClearFilter.innerText = "\u2715"; // X
+				oClearFilter.addEventListener("click", (ev) => {
+					ev.preventDefault();
+
+					oParams.delete("filter");
+					document.location.search = oParams.toString()
+						.replace(rSearchParamWithoutValue, '');
+
+				});
+				document.querySelector(".qunit-filter button")
+					.insertAdjacentElement("beforeBegin", oClearFilter);
+			}
+
+			// Add a hover effect to buttons (colors inspired by QUnit's own CSS)
+			const oStyle = document.createElement('style');
+			oStyle.innerText = `
+				button:hover {
+					background-color: #DDD !important;
+				}
+				button:focus {
+					box-shadow: 0 0 0 2px rgba(94, 116, 11, 0.5) !important;
+				}
+			`;
+			document.head.appendChild(oStyle);
+
 			// remember which lines have been covered initially, at load time
 			saveInitialCoverage();
 		});
 
 		QUnit.done(() => {
 			filterCoverage();
+
+			// "Run all tests" in "Rerunning selected tests" case: Same href as document, but remove
+			// testId
+			const oParams = new URLSearchParams(document.location.search);
+			if (oParams.has("moduleId")) {
+				const oClearFilter = document.querySelector("#qunit-clearFilter");
+				if (oClearFilter) {
+					oParams.delete("testId");
+					const oRunModulesURL = new URL(document.location.href);
+					oRunModulesURL.search = oParams.toString()
+						.replace(rSearchParamWithoutValue, '');
+					oClearFilter.href = oRunModulesURL;
+				}
+			}
 		});
 	}
 }());

package/src/sap/ui/test/OpaBuilder.js

@@ -255,8 +255,8 @@ sap.ui.define(
          *
          * @param {sap.ui.test.Opa5} [oOpaInstance] the Opa5 instance to operate on
          * @param {sap.ui.test.Opa5.SingleControlSelector|sap.ui.test.Opa5.MultiControlSelector} [oOptions] the initial {@link sap.ui.test.Opa5#waitFor} options
-         * @returns {sap.ui.test.OpaBuilder} this OpaBuilder instance
-         * @alias sap.ui.test.OpaBuilder
+         * @returns {module:sap/ui/test/OpaBuilder} this OpaBuilder instance
+         * @alias module:sap/ui/test/OpaBuilder
          * @public
          */
         var OpaBuilder = function (oOpaInstance, oOptions) {
@@ -292,7 +292,7 @@ sap.ui.define(
          * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]} [vMatchers] additional matchers to filter target control(s)
          * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]} [vActions] the actions to be performed on target control(s)
          * @param {sap.ui.test.Opa5.SingleControlSelector|sap.ui.test.Opa5.MultiControlSelector} [oOptions] oOptions the {@link sap.ui.test.Opa5#waitFor} options to apply
-         * @returns {sap.ui.test.OpaBuilder} a new OpaBuilder instance
+         * @returns {module:sap/ui/test/OpaBuilder} a new OpaBuilder instance
          * @public
          * @static
          */
@@ -503,7 +503,7 @@ sap.ui.define(
         /**
          * Adds a matcher that checks whether at least one child fulfilling given matcher(s).
          *
-         * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|sap.ui.test.OpaBuilder}
+         * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|module:sap/ui/test/OpaBuilder}
          *                [vBuilderOrMatcher] the matchers to filter child items
          * @param {boolean} [bDirect] specifies if the ancestor should be a direct ancestor (parent)
          * @returns {this} this OpaBuilder instance
@@ -514,7 +514,7 @@ sap.ui.define(
         };
 
         /**
-         * Adds a matcher that checks states for given conditions. It is internally using {@link sap.ui.test.OpaBuilder.Matchers.conditional}.
+         * Adds a matcher that checks states for given conditions. It is internally using {@link module:sap/ui/test/OpaBuilder#Matchers.conditional}.
          *
          * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|boolean} vConditions conditions to pre-check
          * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|Object} vSuccessMatcher actual matcher that is executed if conditions are met
@@ -527,7 +527,7 @@ sap.ui.define(
         };
 
         /**
-         * Adds a group of matchers that requires only one of them to actually match. It is internally using {@link sap.ui.test.OpaBuilder.Matchers.some}.
+         * Adds a group of matchers that requires only one of them to actually match. It is internally using {@link module:sap/ui/test/OpaBuilder#Matchers.some}.
          *
          * @param [aMatchers=[{sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]}]] aMatchers list of matchers where one must be met
          * @returns {this} this OpaBuilder instance
@@ -630,7 +630,7 @@ sap.ui.define(
         };
 
         /**
-         * Add an action that is only performed if target control fulfills the conditions. It is internally using {@link sap.ui.test.OpaBuilder.Actions.conditional}.
+         * Add an action that is only performed if target control fulfills the conditions. It is internally using {@link module:sap/ui/test/OpaBuilder#Actions.conditional}.
          *
          * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|boolean}
          *            vConditions target control is checked against these given conditions
@@ -702,7 +702,7 @@ sap.ui.define(
          * Executes a builder with matching controls being descendants of matching target control(s).
          * Children are any controls in the control tree beneath this target control(s).
          *
-         * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|sap.ui.test.OpaBuilder} [vChildBuilderOrMatcher] the child builder or child matcher
+         * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|module:sap/ui/test/OpaBuilder} [vChildBuilderOrMatcher] the child builder or child matcher
          * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]}
          *                [vActions] the actions to be performed on matching child items
          * @param {boolean} [bDirect] specifies if the ancestor should be a direct ancestor (parent)
@@ -742,7 +742,7 @@ sap.ui.define(
         /**
          * Adds a success message or function. When providing an OpaBuilder, the action will execute it.
          *
-         * @param {string|function|sap.ui.test.OpaBuilder} vSuccess the message that will be shown (or function executed) on success
+         * @param {string|function|module:sap/ui/test/OpaBuilder} vSuccess the message that will be shown (or function executed) on success
          * @param {boolean} [bReplace] true to replace all previous defined success functions, false to add it (default)
          * @returns {this} this OpaBuilder instance
          * @public
@@ -797,10 +797,10 @@ sap.ui.define(
         };
 
         /**
-         * Set the Opa5 instance to be used for {@link sap.ui.test.OpaBuilder#execute}.
+         * Set the Opa5 instance to be used for {@link module:sap/ui/test/OpaBuilder#execute}.
          * Please note that this function does not return the OpaBuilder instance and can therefore not be chained.
-         * Use the <code>oOpaInstance</code> argument of {@link sap.ui.test.OpaBuilder.create}, {@link sap.ui.test.OpaBuilder#constructor}
-         * or {@link sap.ui.test.OpaBuilder#execute} to provide the Opa5 instance within the builder chain.
+         * Use the <code>oOpaInstance</code> argument of {@link module:sap/ui/test/OpaBuilder#create}, {@link module:sap/ui/test/OpaBuilder#constructor}
+         * or {@link module:sap/ui/test/OpaBuilder#execute} to provide the Opa5 instance within the builder chain.
          * @param {sap.ui.test.Opa5} [oOpaInstance] the Opa5 instance to operate on
          * @public
          */
@@ -812,7 +812,7 @@ sap.ui.define(
         };
 
         /**
-         * Get the Opa5 instance that will be used for {@link sap.ui.test.OpaBuilder#execute}.
+         * Get the Opa5 instance that will be used for {@link module:sap/ui/test/OpaBuilder#execute}.
          * If no {sap.ui.test.Opa5} instance was set before, this function creates a new one lazily.
          * @returns {sap.ui.test.Opa5} the Opa5 instance
          * @public
@@ -827,7 +827,7 @@ sap.ui.define(
         /**
          * A collection of predefined matchers.
          * See also {@link sap.ui.test.matchers}
-         * @namespace sap.ui.test.OpaBuilder.Matchers
+         * @namespace module:sap/ui/test/OpaBuilder#Matchers
          * @public
          */
         OpaBuilder.Matchers = {
@@ -1061,7 +1061,7 @@ sap.ui.define(
              * Creates a matcher function that returns all children fulfilling given matcher(s).
              * The result will always be an array, even if only one child was found.
              *
-             * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|sap.ui.test.OpaBuilder}
+             * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|module:sap/ui/test/OpaBuilder}
              *                [vBuilderOrMatcher] the matchers to filter child items
              * @param {boolean} [bDirect] specifies if the ancestor should be a direct ancestor (parent)
              * @returns {function(sap.ui.core.Element):sap.ui.core.Element[]} matcher function returning all matching children
@@ -1088,7 +1088,7 @@ sap.ui.define(
             /**
              * Creates a matcher function that checks whether one children fulfilling given matcher(s).
              *
-             * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|sap.ui.test.OpaBuilder}
+             * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|module:sap/ui/test/OpaBuilder}
              *                [vBuilderOrMatcher] the matchers to filter child items
              * @param {boolean} [bDirect] specifies if the ancestor should be a direct ancestor (parent)
              * @returns {function(sap.ui.core.Element):boolean} matcher function
@@ -1352,7 +1352,7 @@ sap.ui.define(
 
         /**
          * A collection of predefined actions. See also {@link sap.ui.test.actions}.
-         * @namespace sap.ui.test.OpaBuilder.Actions
+         * @namespace module:sap/ui/test/OpaBuilder#Actions
          * @public
          */
         OpaBuilder.Actions = {
@@ -1394,9 +1394,9 @@ sap.ui.define(
              *
              * @param {sap.ui.test.Opa5.Matcher|sap.ui.test.Opa5.Matcher[]|boolean}
              *            vConditions target control is checked against these given conditions
-             * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]|sap.ui.test.OpaBuilder}
+             * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]|module:sap/ui/test/OpaBuilder}
              *            vSuccessBuilderOrOptions the actions to be performed when conditions are fulfilled
-             * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]|sap.ui.test.OpaBuilder}
+             * @param {sap.ui.test.Opa5.Action|sap.ui.test.Opa5.Action[]|module:sap/ui/test/OpaBuilder}
              *            [vElseBuilderOptions] the action(s) to be performed when conditions are not fulfilled
              * @returns {function(sap.ui.core.Element)} an action function
              * @public

package/src/sap/ui/test/autowaiter/_jsAnimationWaiter.js

@@ -5,8 +5,9 @@
  */
 
 sap.ui.define([
+	"sap/base/util/extend",
 	"./WaiterBase"
-], function(WaiterBase) {
+], function(extend, WaiterBase) {
 	"use strict";
 
 	var oState = {
@@ -15,10 +16,12 @@ sap.ui.define([
 		CANCELLED: "CANCELLED"
 	};
 
+	var iInitiatorId = null;
+
 	var JSAnimationWaiter = WaiterBase.extend("sap.ui.test.autowaiter._jsAnimationWaiter", {
 		constructor: function() {
 			WaiterBase.apply(this, arguments);
-			this._oTrackedAnimations = new Set();
+			this._oTrackedAnimations = new Map();
 
 			if (window.requestAnimationFrame) {
 				var fnOriginalRequestAnimationFrame = window.requestAnimationFrame;
@@ -26,8 +29,13 @@ sap.ui.define([
 					var sId,
 						aCallbackArgs = Array.prototype.slice.call(arguments, 1),
 						wrappedCallback = function(iTimestamp) {
-							callback(iTimestamp);
-							this._deregister(sId, oState.EXECUTED);
+							iInitiatorId = sId;
+							try {
+								callback(iTimestamp);
+							} finally {
+								iInitiatorId = null;
+								this._deregister(sId, oState.EXECUTED);
+							}
 						}.bind(this);
 
 					sId = fnOriginalRequestAnimationFrame.apply(null, [wrappedCallback].concat(aCallbackArgs));
@@ -48,7 +56,8 @@ sap.ui.define([
 
 		_register: function(sId, sReason) {
 			this._oLogger.trace("register", "ID: " + sId + " Reason: " + sReason);
-			this._oTrackedAnimations.add(sId);
+			var iStartTime = this._oTrackedAnimations.get(iInitiatorId)?.startTime || Date.now();
+			this._oTrackedAnimations.set(sId, {startTime: iStartTime});
 		},
 
 		_deregister: function(sId, sReason) {
@@ -56,8 +65,32 @@ sap.ui.define([
 			this._oTrackedAnimations.delete(sId);
 		},
 
+		_getDefaultConfig: function () {
+			return extend({
+				// animations that exceed the maxDuration will be ignored (considered as background processes)
+				maxDuration: 1000 	// milliseconds
+			}, WaiterBase.prototype._getDefaultConfig.call(this));
+		},
+
+		_getValidationInfo: function () {
+			return extend({
+				maxDuration: "numeric"
+			}, WaiterBase.prototype._getValidationInfo.call(this));
+		},
+
 		hasPending: function () {
-			var bHasPending = this._oTrackedAnimations.size > 0;
+			var bHasPending = false,
+				iMaxDuration = this._getDefaultConfig().maxDuration,
+				iElapsedTime;
+			for (var oEntry of this._oTrackedAnimations.values()) {
+				iElapsedTime = Date.now() - oEntry.startTime;
+				// ignore animations that excede the <code>iMaxDuration</code>
+				// as these are considered background processes that never end
+				if (iElapsedTime < iMaxDuration) {
+					bHasPending = true;
+				}
+			}
+
 			this._oLogger.trace("hasPending", bHasPending);
 			if (bHasPending) {
 				this._oHasPendingLogger.debug("jsAnimation in progress");