@openui5/sap.ui.core 1.119.1 → 1.120.1

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

@@ -133,8 +133,9 @@ sap.ui.define([
 		 * @param {object} oElement - Any node or leaf element
 		 * @param {sap.ui.model.odata.v4.lib._CollectionCache} oCache
 		 *   The group level cache which the given element has been read from
-		 * @param {number} iIndex
-		 *   The index of the given element within the cache's collection
+		 * @param {number|undefined} [iIndex]
+		 *   The $skip index of the given element within the cache's collectionn, or
+		 *   <code>undefined</code> for created elements (where it is always unknown)
 		 * @param {string} [sNodeProperty]
 		 *   Optional property path to the hierarchy node value
 		 * @throws {Error}
@@ -169,6 +170,7 @@ sap.ui.define([
 				_AggregationHelper.checkNodeProperty(oPlaceholder, oElement, sNodeProperty);
 			}
 
+			_Helper.copyPrivateAnnotation(oPlaceholder, "cache", oElement);
 			_Helper.copyPrivateAnnotation(oPlaceholder, "spliced", oElement);
 			if (_Helper.getPrivateAnnotation(oPlaceholder, "placeholder") === 1) {
 				if ((oPlaceholder["@$ui5.node.isExpanded"] === undefined)
@@ -516,9 +518,10 @@ sap.ui.define([
 				sApply += "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root"
 					+ (oAggregation.$path || "")
 					+ ",HierarchyQualifier='" + oAggregation.hierarchyQualifier
-					+ "',NodeProperty='" + sNodeProperty
-					+ "',Levels=" + (bAllLevels ? 999 : oAggregation.expandTo || 1)
-					+ ")";
+					+ "',NodeProperty='" + sNodeProperty + "'"
+					+ (bAllLevels || oAggregation.expandTo >= Number.MAX_SAFE_INTEGER
+						? ")" // "all levels"
+						: ",Levels=" + (oAggregation.expandTo || 1) + ")");
 				if (bAllLevels) {
 					select("DistanceFromRootProperty");
 				} else if (oAggregation.expandTo > 1) {
@@ -612,7 +615,9 @@ sap.ui.define([
 		 * Creates a placeholder.
 		 *
 		 * @param {number} iLevel - The level
-		 * @param {number} iIndex - The index within the parent cache
+		 * @param {number|undefined} [iIndex]
+		 *   The $skip index within the parent cache's collection, or <code>undefined</code> for
+		 *   created elements (where it is always unknown)
 		 * @param {sap.ui.model.odata.v4.lib._CollectionCache} oParentCache - The parent cache
 		 * @returns {object} A placeholder object
 		 *
@@ -758,7 +763,7 @@ sap.ui.define([
 		 * @see .getOrCreateExpandedObject
 		 */
 		getCollapsedObject : function (oGroupNode) {
-			return _Helper.getPrivateAnnotation(oGroupNode, "collapsed") || oFrozenCollapsed;
+			return _Helper.getPrivateAnnotation(oGroupNode, "collapsed", oFrozenCollapsed);
 		},
 
 		/**

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

@@ -183,7 +183,7 @@ sap.ui.define([
 				}
 				if (vCacheData.$postBodyCollection) { // within a deep create
 					vCacheData.$postBodyCollection.splice(iIndex, 1);
-					that.removeElement(vCacheData, iIndex, sTransientPredicate, sParentPath);
+					that.removeElement(iIndex, sTransientPredicate, vCacheData, sParentPath);
 					fnCallback(iIndex, -1);
 					oError = new Error("Deleted from deep create");
 					oError.canceled = true;
@@ -204,7 +204,7 @@ sap.ui.define([
 			if (Array.isArray(vCacheData)) {
 				oDeleted = that.addDeleted(vCacheData, iIndex, sKeyPredicate, oGroupLock,
 					!!sTransientPredicate);
-				that.removeElement(vCacheData, iIndex, sKeyPredicate, sParentPath);
+				that.removeElement(iIndex, sKeyPredicate, vCacheData, sParentPath);
 			}
 			fnCallback(iIndex, -1);
 			if (oGroupLock) {
@@ -331,7 +331,7 @@ sap.ui.define([
 			sRootPathEnd = sPath.indexOf(")", sPath.indexOf("($uid=")) + 1,
 			// the root transient element of the deep create
 			oRoot = this.getValue(sPath.slice(0, sRootPathEnd)),
-			mSelectForMetaPath = _Helper.getPrivateAnnotation(oRoot, "select") || {},
+			mSelectForMetaPath = _Helper.getPrivateAnnotation(oRoot, "select", {}),
 			that = this;
 
 		function setPostBodyCollection() {
@@ -1431,9 +1431,11 @@ sap.ui.define([
 	 * @param {string} sPath
 	 *   The entity collection's path within this cache, may be <code>""</code>
 	 * @param {number} [iIndex]
-	 *   The array index of the entity to be refreshed
+	 *   The array index of the entity to be refreshed, <code>-1</code> if unknown (then a key
+	 *   predicate must be given)
 	 * @param {string} [sPredicate]
-	 *   The key predicate of the entity; only evaluated if <code>iIndex === undefined</code>
+	 *   The key predicate of the entity; only evaluated if <code>iIndex</code> is undefined or
+	 *   negative
 	 * @param {boolean} [bKeepAlive]
 	 *   Whether the entity is kept-alive
 	 * @param {boolean} [bWithMessages]
@@ -1443,7 +1445,7 @@ sap.ui.define([
 	 *   The function is called just before the back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
 	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise which resolves without a defined result when it is updated in the cache; it
+	 *   A promise which resolves with the refreshed entity after it was updated in the cache, and
 	 *   rejects with an error when no key predicate is known.
 	 * @throws {Error} If the cache is shared
 	 *
@@ -1464,7 +1466,7 @@ sap.ui.define([
 					_Helper.getQueryOptionsForPath(that.mQueryOptions, sPath)),
 				sReadUrl;
 
-			if (iIndex !== undefined) {
+			if (iIndex >= 0) {
 				sPredicate = _Helper.getPrivateAnnotation(aElements[iIndex], "predicate");
 			}
 			if (!sPredicate) { // Note: no need to give path here, error is wrapped by ODLB!
@@ -1501,6 +1503,8 @@ sap.ui.define([
 
 				that.replaceElement(aElements, iIndex, sPredicate, oElement, aResult[1], sPath,
 					bKeepReportedMessagesPath);
+
+				return oElement;
 			});
 		});
 	};
@@ -1627,12 +1631,12 @@ sap.ui.define([
 					throw new Error(
 						"Unexpected server response, more than one entity returned.");
 				} else if (aReadResult.length === 0) {
-					that.removeElement(aElements, iIndex, sPredicate, sPath);
+					that.removeElement(iIndex, sPredicate, aElements, sPath);
 					that.oRequestor.getModelInterface()
 						.reportStateMessages(that.sResourcePath, {}, [sPath + sPredicate]);
 					fnOnRemove(false);
 				} else if (bRemoveFromCollection) {
-					that.removeElement(aElements, iIndex, sPredicate, sPath);
+					that.removeElement(iIndex, sPredicate, aElements, sPath);
 					// element no longer in cache -> re-insert via replaceElement
 					that.replaceElement(aElements, undefined, sPredicate, aReadResult[0],
 						mTypeForMetaPath, sPath);
@@ -1665,14 +1669,18 @@ sap.ui.define([
 	 * <code>$byPredicate</code>, <code>$created</code> and <code>$count</code>, and a collection
 	 * cache's limit and number of active elements (if applicable).
 	 *
-	 * @param {object[]} [aElements]
-	 *   The array of elements, defaults to a collection cache's own elements
+	 * If the predicate is given, the index is determined again to handle the case that the element
+	 * has been moved (via a parallel insert/delete) in the meantime. Otherwise, the index is taken
+	 * as is.
+	 *
 	 * @param {number} [iIndex]
 	 *   The array index of the old element to be removed or <code>undefined</code> in case the
 	 *   element is a kept-alive element without an index
-	 * @param {string} sPredicate
+	 * @param {string} [sPredicate]
 	 *   The key predicate of the old element to be removed
-	 * @param {string} sPath
+	 * @param {object[]} [aElements]
+	 *   The array of elements, defaults to a collection cache's own elements
+	 * @param {string} [sPath=""]
 	 *   The element collection's path within this cache (as used by change listeners), may be
 	 *   <code>""</code> (only in a CollectionCache)
 	 * @returns {number|undefined} The index at which the element actually was (it might have moved
@@ -1680,23 +1688,27 @@ sap.ui.define([
 	 *
 	 * @protected
 	 */
-	// eslint-disable-next-line default-param-last
-	_Cache.prototype.removeElement = function (aElements = this.aElements, iIndex, sPredicate,
-			sPath) {
-		var oElement = aElements.$byPredicate[sPredicate],
-			bDeleted = oElement["@$ui5.context.isDeleted"],
-			sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
-
-		if (iIndex !== undefined) {
+	_Cache.prototype.removeElement = function (iIndex, sPredicate, aElements = this.aElements,
+			sPath = "") {
+		const oElement = sPredicate
+			? aElements.$byPredicate[sPredicate]
+			: aElements[iIndex]; // undefined in case it was not yet read
+
+		if (!sPredicate) {
+			sPredicate = oElement && _Helper.getPrivateAnnotation(oElement, "predicate");
+		} else if (iIndex !== undefined) {
 			// the element might have moved due to parallel insert/delete
 			iIndex = _Cache.getElementIndex(aElements, sPredicate, iIndex);
 		}
+		const bDeleted = oElement?.["@$ui5.context.isDeleted"];
 		if (!bDeleted) {
 			delete aElements.$byPredicate[sPredicate];
 		}
 		if (iIndex >= 0) {
 			aElements.splice(iIndex, 1);
 			_Helper.addToCount(this.mChangeListeners, sPath, aElements, -1);
+			const sTransientPredicate
+				= oElement && _Helper.getPrivateAnnotation(oElement, "transientPredicate");
 			if (sTransientPredicate) {
 				aElements.$created -= 1;
 				if (!sPath) {
@@ -1917,14 +1929,15 @@ sap.ui.define([
 	 *   <code>""</code> (only in a CollectionCache)
 	 * @param {int} [iDeletedIndex]
 	 *   The index of the entry in <code>aElements.$deleted</code> if any
-	 *
+	 * @param {string} [sTransientPredicate]
+	 *  The element's (future) transient predicate
 	 * @protected
 	 */
 	// eslint-disable-next-line default-param-last
 	_Cache.prototype.restoreElement = function (aElements = this.aElements, iIndex, oElement, sPath,
-			iDeletedIndex) {
+			iDeletedIndex,
+			sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate")) {
 		this.adjustIndexes(sPath, aElements, iIndex, 1, iDeletedIndex);
-		const sTransientPredicate = _Helper.getPrivateAnnotation(oElement, "transientPredicate");
 		if (sTransientPredicate) {
 			aElements.$created += 1;
 			if (!sPath) {
@@ -2432,7 +2445,7 @@ sap.ui.define([
 					if (!sCollectionPath) {
 						// remember the key predicates / indices of the root entries to remove all
 						// messages for entities that have been read
-						aCachePaths.push(sPredicate || iIndex.toString());
+						aCachePaths.push(sPredicate || "" + iIndex);
 					}
 					if (sPredicate) {
 						mByPredicate[sPredicate] = vInstance;
@@ -2655,16 +2668,20 @@ sap.ui.define([
 
 	/**
 	 * Drops the element with the given index and predicate from this cache's collection, so that it
-	 * will be read again from the server later on. Created persisted elements loose their special
+	 * will be read again from the server later on. Created persisted elements lose their special
 	 * treatment!
 	 *
 	 * @param {number} iIndex - An index
 	 * @param {string} sPredicate - A key predicate
+	 * @param {boolean} [bIndexIsSkip] - Whether <code>iIndex</code> is a raw $skip index
 	 * @throws {Error} When the element with the given index is still transient
 	 *
 	 * @public
 	 */
-	_CollectionCache.prototype.drop = function (iIndex, sPredicate) {
+	_CollectionCache.prototype.drop = function (iIndex, sPredicate, bIndexIsSkip) {
+		if (bIndexIsSkip) {
+			iIndex += this.aElements.$created;
+		}
 		const oElement = this.aElements[iIndex];
 		if (oElement["@$ui5.context.isTransient"]) {
 			throw new Error("Must not drop a transient element");
@@ -3114,6 +3131,8 @@ sap.ui.define([
 	 * @param {function} [fnDataRequested]
 	 *   The function is called just before a back-end request is sent.
 	 *   If no back-end request is needed, the function is not called.
+	 * @param {boolean} [bIndexIsSkip]
+	 *   Whether <code>iIndex</code> is a raw $skip index
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise to be resolved with the requested range given as an OData response object (with
 	 *   "@odata.context" and the rows as an array in the property <code>value</code>, enhanced
@@ -3128,7 +3147,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.lib._Requestor#request
 	 */
 	_CollectionCache.prototype.read = function (iIndex, iLength, iPrefetchLength, oGroupLock,
-			fnDataRequested) {
+			fnDataRequested, bIndexIsSkip) {
 		var iCreatedPersisted = 0,
 			oElement,
 			aElementsRange,
@@ -3148,10 +3167,14 @@ sap.ui.define([
 
 		if (oPromise) {
 			return oPromise.then(function () {
-				return that.read(iIndex, iLength, iPrefetchLength, oGroupLock, fnDataRequested);
+				return that.read(iIndex, iLength, iPrefetchLength, oGroupLock, fnDataRequested,
+					bIndexIsSkip);
 			});
 		}
 
+		if (bIndexIsSkip) {
+			iIndex += this.aElements.$created;
+		}
 		for (i = 0; i < this.aElements.$created; i += 1) {
 			oElement = this.aElements[i];
 			if (_Helper.getPrivateAnnotation(oElement, "transient") === oGroupLock.getGroupId()) {
@@ -3311,7 +3334,7 @@ sap.ui.define([
 						oElement = that.aElements.$byPredicate[sPredicate];
 						if (_Helper.hasPrivateAnnotation(oElement, "transientPredicate")) {
 							// Note: iIndex unknown, use -1 instead
-							iIndex = that.removeElement(that.aElements, -1, sPredicate, "");
+							iIndex = that.removeElement(-1, sPredicate);
 						} else {
 							delete that.aElements.$byPredicate[sPredicate];
 						}

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

@@ -1627,16 +1627,18 @@ sap.ui.define([
 		 * @param {string} sAnnotation
 		 *   The unqualified name of a private client-side instance annotation (hidden inside
 		 *   namespace "@$ui5._")
+		 * @param {any} [vDefault]
+		 *   The default value to be used instead of <code>undefined</code>
 		 * @returns {any}
-		 *   The annotation's value or <code>undefined</code> if no such annotation exists (e.g.
+		 *   The annotation's value or the given default if no such annotation exists (e.g.
 		 *   because the private namespace object does not exist)
 		 *
 		 * @public
 		 */
-		getPrivateAnnotation : function (oObject, sAnnotation) {
-			var oPrivateNamespace = oObject["@$ui5._"];
+		getPrivateAnnotation : function (oObject, sAnnotation, vDefault) {
+			const vResult = oObject["@$ui5._"]?.[sAnnotation];
 
-			return oPrivateNamespace && oPrivateNamespace[sAnnotation];
+			return vResult === undefined ? vDefault : vResult;
 		},
 
 		/**

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

@@ -12,11 +12,11 @@ sap.ui.define([
 	"./_V2Requestor",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/Configuration",
 	"sap/ui/core/cache/CacheManager",
+	"sap/ui/security/Security",
 	"sap/ui/thirdparty/jquery"
-], function (_Batch, _GroupLock, _Helper, asV2Requestor, Log, SyncPromise, Configuration,
-		CacheManager, jQuery) {
+], function (_Batch, _GroupLock, _Helper, asV2Requestor, Log, SyncPromise, CacheManager,
+		Security, jQuery) {
 	"use strict";
 
 	var mBatchHeaders = { // headers for the $batch request
@@ -1521,8 +1521,8 @@ sap.ui.define([
 
 	/**
 	 * Calls the security token handlers returned by
-	 * {@link sap.ui.core.Configuration#getSecurityTokenHandlers} one by one with the requestor's
-	 * service URL. The first handler not returning <code>undefined</code> but a
+	 * {@link module:sap/ui/security/Security.getSecurityTokenHandlers} one by one with the
+	 * requestor's service URL. The first handler not returning <code>undefined</code> but a
 	 * <code>Promise</code> is used to determine the required security tokens.
 	 *
 	 * @private
@@ -1532,7 +1532,7 @@ sap.ui.define([
 
 		this.oSecurityTokenPromise = null;
 
-		Configuration.getSecurityTokenHandlers().some(function (fnHandler) {
+		Security.getSecurityTokenHandlers().some(function (fnHandler) {
 			var oSecurityTokenPromise = fnHandler(that.sServiceUrl);
 
 			if (oSecurityTokenPromise !== undefined) {

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

@@ -17,11 +17,11 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/base/i18n/ResourceBundle",
 	"sap/ui/base/SyncPromise",
-	"sap/ui/core/Configuration",
+	"sap/ui/core/Supportability",
 	"sap/ui/model/BindingMode",
 	"sap/ui/model/Model",
 	"./ResourcePropertyBinding"
-], function (Log, ResourceBundle, SyncPromise, Configuration, BindingMode, Model, ResourcePropertyBinding) {
+], function (Log, ResourceBundle, SyncPromise, Supportability, BindingMode, Model, ResourcePropertyBinding) {
 	"use strict";
 
 	var sClassname = "sap.ui.model.resource.ResourceModel",
@@ -227,7 +227,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 
@@ -376,8 +376,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.core.Component
 	 */
 	ResourceModel.loadResourceBundle = function (oData, bAsync) {
-		var oConfiguration = Configuration,
-			sLocale = oData.bundleLocale,
+		var sLocale = oData.bundleLocale,
 			mParams;
 
 		// sanitize bundleName for backward compatibility
@@ -385,7 +384,7 @@ sap.ui.define([
 
 		mParams = Object.assign({
 			async: bAsync,
-			includeInfo: oConfiguration.getOriginInfo(),
+			includeInfo: Supportability.collectOriginInfo(),
 			locale: sLocale
 		}, oData);
 

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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.119.1
+	 * @version 1.120.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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.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.119.1
+	 * @version 1.120.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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.119.1
+	 * @version 1.120.1
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -26,6 +26,9 @@ sap.ui.define([
 	 * @param {sap.ui.model.Sorter|sap.ui.model.Sorter[]} [aSorters] initial sort order (can be either a sorter or an array of sorters)
 	 * @param {sap.ui.model.Filter|sap.ui.model.Filter[]} [aFilters] predefined filter/s (can be either a filter or an array of filters)
 	 * @param {object} [mParameters]
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
 	 * @alias sap.ui.model.xml.XMLListBinding
 	 * @extends sap.ui.model.ClientListBinding
 	 */

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.119.1
+	 * @version 1.120.1
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

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

@@ -20,6 +20,9 @@ sap.ui.define(['sap/ui/model/ClientTreeBinding', "sap/base/util/each"],
 	 * @param {object} [oContext] Context object for this binding
 	 * @param {array} [aFilters] Predefined filters contained in an array
 	 * @param {object} [mParameters] Additional model-specific parameters
+	 * @throws {Error} If one of the filters uses an operator that is not supported by the underlying model
+	 *   implementation or if the {@link sap.ui.model.Filter.NONE} filter instance is contained in
+	 *   <code>aFilters</code> together with other filters
 	 * @protected
 	 * @alias sap.ui.model.xml.XMLTreeBinding
 	 * @extends sap.ui.model.ClientTreeBinding

package/src/sap/ui/performance/BeaconRequest.js

@@ -37,9 +37,9 @@ sap.ui.define([], function () {
 		 * or in case the active tab is closed. On mobile devices it's the only
 		 * reliable event for detecting tab switch or minimizing/closing the
 		 * browser.
-		 * Previously also the pagehinde event was needed because safari did not
+		 * Previously also the 'pagehide' event was needed because safari did not
 		 * fire the 'visibilitychange' event on navigating away from a page but
-		 * but as of Safari 14.5 this issue is fixed.
+		 * as of Safari 14.5 this issue is fixed.
 		 */
 		document.addEventListener("visibilitychange", function () {
 			if (document.visibilityState === "hidden") {

package/src/sap/ui/performance/trace/Interaction.js

@@ -23,7 +23,7 @@ sap.ui.define([
 		INTERACTION = "INTERACTION",
 		isNavigation = false,
 		aInteractions = [],
-		oPendingInteraction = createMeasurement(),
+		oPendingInteraction,
 		mCompressedMimeTypes = {
 			"application/zip": true,
 			"application/vnd.rar": true,
@@ -34,6 +34,8 @@ sap.ui.define([
 			"application/pdf": true
 		},
 		sCompressedExtensions = "zip,rar,arj,z,gz,tar,lzh,cab,hqx,ace,jar,ear,war,jpg,jpeg,pdf,gzip";
+	let bInitialized = false,
+		iResetCurrentBrowserEventTimer;
 
 	function isCORSRequest(sUrl) {
 		var sHost = new URI(sUrl).host();
@@ -242,6 +244,7 @@ sap.ui.define([
 			isNavigation = false;
 			bMatched = false;
 			bPerfectMatch = false;
+			clearTimeout(iResetCurrentBrowserEventTimer);
 		}
 	}
 
@@ -272,7 +275,6 @@ sap.ui.define([
 	}
 
 	var bInteractionActive = false,
-		bInteractionProcessed = false,
 		oCurrentBrowserEvent,
 		oBrowserElement,
 		bMatched = false,
@@ -535,11 +537,10 @@ sap.ui.define([
 			var oComponentInfo = createOwnerComponentInfo(oSrcElement);
 
 			// setup new pending interaction
-			oPendingInteraction = createMeasurement(iTime);
+			oPendingInteraction = createMeasurement(bInitialized ? iTime : undefined);
 			oPendingInteraction.event = sType;
 			oPendingInteraction.component = oComponentInfo.id;
 			oPendingInteraction.appVersion = oComponentInfo.version;
-			oPendingInteraction.start = iTime;
 			if (oSrcElement && oSrcElement.getId) {
 				oPendingInteraction.trigger = oSrcElement.getId();
 				oPendingInteraction.semanticStepName = FESRHelper.getSemanticStepname(oSrcElement, sType);
@@ -602,14 +603,20 @@ sap.ui.define([
 		 * @since 1.76
 		 */
 		setActive : function(bActive) {
-			if (bActive && !bInteractionActive) {
-				registerXHROverrides();
-				interceptScripts();
-				//intercept resource loading from preloads
-				LoaderExtensions.notifyResourceLoading = Interaction.notifyAsyncStep;
-			}
 			bInteractionActive = bActive;
-			Interaction.notifyStepStart("startup", "startup", true);
+			if (bActive) {
+				if (!bInitialized) {
+					registerXHROverrides();
+					interceptScripts();
+					//intercept resource loading from preloads
+					LoaderExtensions.notifyResourceLoading = Interaction.notifyAsyncStep;
+				}
+				Interaction.notifyStepStart("startup", "startup", true);
+				// The following line must happen after 'notifyStepStart' because we determine
+				// if we should intially use the performance timing API or afterwords the
+				// current timestamp
+				bInitialized = true;
+			}
 		},
 
 		/**
@@ -661,7 +668,7 @@ sap.ui.define([
 					elem,
 					sClosestSemanticStepName;
 
-				if ((!oPendingInteraction && oCurrentBrowserEvent && !bInteractionProcessed) || bForce) {
+				if ((!oPendingInteraction && oCurrentBrowserEvent) || bForce) {
 					if (bForce) {
 						sType = "startup";
 					} else {
@@ -708,13 +715,10 @@ sap.ui.define([
 						}
 					}
 					oCurrentBrowserEvent = null;
-					//only handle the first browser event within a call stack. Ignore virtual/harmonization events.
-					bInteractionProcessed = true;
 					isNavigation = false;
-					setTimeout(function() {
+					iResetCurrentBrowserEventTimer = setTimeout(function() {
 						//cleanup internal registry after actual call stack.
 						oCurrentBrowserEvent = null;
-						bInteractionProcessed = false;
 					}, 0);
 					bIdle = false;
 					Interaction.notifyStepEnd(true); // Start timer to end Interaction in case there is no timing relevant action e.g. rendering, request