@openui5/sap.ui.core 1.103.0 → 1.105.0

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

@@ -1447,10 +1447,6 @@ sap.ui.define([
 		 *   The meta path for the cache root's type, for example "/SalesOrderList/SO_2_BP" or
 		 *   "/Artists/foo.EditAction/@$ui5.overload/0/$ReturnType/$Type", such that an OData simple
 		 *   identifier may be appended
-		 * @param {object} mNavigationPropertyPaths
-		 *   Hash set of collection-valued navigation property meta paths (relative to the cache's
-		 *   root, that is without the root meta path prefix) which need to be refreshed, maps
-		 *   string to <code>true</code>; is modified
 		 * @param {string} [sPrefix=""]
 		 *   Optional prefix for navigation property meta paths used during recursion
 		 * @param {boolean} [bAllowEmptySelect]
@@ -1462,7 +1458,7 @@ sap.ui.define([
 		 *   collection-valued navigation property
 		 */
 		intersectQueryOptions : function (mCacheQueryOptions, aPaths, fnFetchMetadata,
-				sRootMetaPath, mNavigationPropertyPaths, sPrefix, bAllowEmptySelect) {
+				sRootMetaPath, sPrefix, bAllowEmptySelect) {
 			var aExpands = [],
 				mExpands = {},
 				mResult,
@@ -1519,9 +1515,6 @@ sap.ui.define([
 
 					_Helper.addChildrenWithAncestor([sNavigationPropertyPath], aPaths, mSet);
 					if (!isEmptyObject(mSet)) {
-						if (fnFetchMetadata(sMetaPath).getResult().$isCollection) {
-							mNavigationPropertyPaths[sPrefixedNavigationPropertyPath] = true;
-						}
 						// complete navigation property may change, same expand as initially
 						mExpands[sNavigationPropertyPath]
 							= mCacheQueryOptions.$expand[sNavigationPropertyPath];
@@ -1539,7 +1532,7 @@ sap.ui.define([
 						mChildQueryOptions = _Helper.intersectQueryOptions(
 							mCacheQueryOptions.$expand[sNavigationPropertyPath] || {},
 							aStrippedPaths, fnFetchMetadata, sMetaPath,
-							mNavigationPropertyPaths, sPrefixedNavigationPropertyPath);
+							sPrefixedNavigationPropertyPath);
 						if (mChildQueryOptions) {
 							mExpands[sNavigationPropertyPath] = mChildQueryOptions;
 						}
@@ -1584,6 +1577,19 @@ sap.ui.define([
 			return _Helper.getRelativePath(sPath, sBasePath) !== undefined;
 		},
 
+		/**
+		 * Tells whether the given map of binding parameters is defining data aggregation, but not a
+		 * recursive hierarchy.
+		 *
+		 * @param {object} [mParameters] - Map of binding parameters
+		 * @returns {boolean} Whether it's about data aggregation
+		 */
+		isDataAggregation : function (mParameters) {
+			return mParameters
+				&& mParameters.$$aggregation
+				&& !mParameters.$$aggregation.hierarchyQualifier;
+		},
+
 		/**
 		 * Tells whether the value is a safe integer.
 		 *
@@ -1602,6 +1608,48 @@ sap.ui.define([
 			return iNumber <= 9007199254740991 && Math.floor(iNumber) === iNumber;
 		},
 
+		/**
+		 * Determines whether the given property path is selected in the given query options.
+		 *
+		 * A property path is selected if $select in the query options or the matching $expand
+		 * <ul>
+		 *   <li> is missing
+		 *   <li> contains "*"
+		 *   <li> contains the property or its surrounding complex type.
+		 * </ul>
+		 *
+		 * Note: The function works w/o metadata, this means that not for all combinations of the
+		 * given arguments the function might return the right result.
+		 * Example: Assuming SO_2_BP is a navigation property, then
+		 * <code>_Helper.isSelected("SO_2_BP/Picture", {$select : ["*"]})</code>
+		 * will return true, because SO_2_BP would be taken as a structural property. So far this is
+		 * ok, because within all known scenarios such combinations do not happen.
+		 *
+		 * @param {string} sPropertyPath The path to the structural property as meta path
+		 * @param {object} [mQueryOptions] The query options to be analyzed
+		 * @returns {boolean} Whether the property for the given path was already selected
+		 */
+		isSelected : function (sPropertyPath, mQueryOptions) {
+			var sPath, sRelativePath;
+
+			if (!mQueryOptions) {
+				return false;
+			}
+			if (mQueryOptions.$expand) {
+				for (sPath in mQueryOptions.$expand) {
+					sRelativePath = _Helper.getRelativePath(sPropertyPath, sPath);
+					if (sRelativePath) {
+						return _Helper.isSelected(sRelativePath, mQueryOptions.$expand[sPath]);
+					}
+				}
+			}
+			return !mQueryOptions.$select
+				|| mQueryOptions.$select.includes("*")
+				|| mQueryOptions.$select.some(function (sSelect) {
+					return _Helper.hasPathPrefix(sPropertyPath, sSelect);
+				});
+		},
+
 		/**
 		 * Make the given URL absolute using the given base URL. The URLs must not contain a host
 		 * or protocol part. Ensures that key predicates are not %-encoded.
@@ -1825,6 +1873,22 @@ sap.ui.define([
 			}
 		},
 
+		/**
+		 * Sets the new value of the annotation with the given name at the given object; removes it
+		 * in case of an <code>undefined</code> value.
+		 *
+		 * @param {object} oObject - Any object
+		 * @param {string} sAnnotation - The annotation's name
+		 * @param {any} [vValue] - The annotation's new value
+		 */
+		setAnnotation : function (oObject, sAnnotation, vValue) {
+			if (vValue !== undefined) {
+				oObject[sAnnotation] = vValue;
+			} else {
+				delete oObject[sAnnotation];
+			}
+		},
+
 		/**
 		 * Sets the new value of the private client-side instance annotation with the given
 		 * unqualified name at the given object.

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

@@ -550,6 +550,8 @@ sap.ui.define([
 						&& oCandidate.headers["If-Match"] === oChange.headers["If-Match"]) {
 					_Helper.merge(oCandidate.body, oChange.body);
 					oChange.$resolve(oCandidate.$promise);
+					oCandidate.$mergeRequests(oChange.$mergeRequests());
+
 					return true;
 				}
 			});
@@ -1597,18 +1599,18 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes the pending PATCH request for the given promise from its group. Only requests for
-	 * which the <code>$cancel</code> callback is defined are removed.
+	 * Removes the pending PATCH or DELETE request for the given promise from its group. Only
+	 * requests for which the <code>$cancel</code> callback is defined are removed.
 	 *
 	 * @param {Promise} oPromise
-	 *   A promise that has been returned for a PATCH request. That request will be rejected with
-	 *   an error with property <code>canceled = true</code>.
+	 *   A promise that has been returned for a PATCH or DELETE request. That request will be
+	 *   rejected with an error with property <code>canceled = true</code>.
 	 * @throws {Error}
 	 *   If the request is not in the queue, assuming that it has been submitted already
 	 *
 	 * @private
 	 */
-	_Requestor.prototype.removePatch = function (oPromise) {
+	_Requestor.prototype.removeChangeRequest = function (oPromise) {
 		var bCanceled = this.cancelChangesByFilter(function (oChangeRequest) {
 				return oChangeRequest.$promise === oPromise;
 			});
@@ -1711,7 +1713,7 @@ sap.ui.define([
 	 * @param {any} [vOwner]
 	 *   An additional precondition for the merging of GET requests: the owner must be identical.
 	 * @param {function(string[]):string[]} [fnMergeRequests]
-	 *   Function which is called during merging of GET requests. If a merged request has a
+	 *   Function which is called during merging of GET or PATCH requests. If a merged request has a
 	 *   function given, this function will be called and its return value is
 	 *   given to the one remaining request's function as a parameter.
 	 * @returns {Promise}

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

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 */
 	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/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @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/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.103.0
+	 * @version 1.105.0
 	 *
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] formatting options. Supports the same options as {@link sap.ui.core.format.FileSizeFormat.getInstance FileSizeFormat.getInstance}

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.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

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.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

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.103.0
+	 * @version 1.105.0
 	 *
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @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.103.0
+	 * @version 1.105.0
 	 *
 	 * @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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

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

@@ -47,9 +47,11 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
+	 *
+	 * @param {XMLDocument|string} oData
+	 *   Either the URL where to load the XML from or an XML document
 	 *
-	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public
 	 * @alias sap.ui.model.xml.XMLModel
 	 */

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

@@ -203,35 +203,38 @@ sap.ui.define([
 	}
 
 	function onInteractionFinished(oFinishedInteraction) {
-		var sStepName = oFinishedInteraction.semanticStepName ? oFinishedInteraction.semanticStepName : oFinishedInteraction.trigger + "_" + oFinishedInteraction.event;
-		var oFESRHandle = FESR.onBeforeCreated({
-			stepName: sStepName,
-			appNameLong: oFinishedInteraction.stepComponent || oFinishedInteraction.component,
-			appNameShort: oFinishedInteraction.stepComponent || oFinishedInteraction.component,
-			timeToInteractive: oFinishedInteraction.duration,
-			interactionType: determineInteractionType(sStepName)
-		}, oFinishedInteraction);
-
-		// do not send UI-only FESR with piggyback approach
-		if (oBeaconRequest || oFinishedInteraction.requests.length > 0) {
-			createHeader(oFinishedInteraction, oFESRHandle);
-			if (oBeaconRequest) {
-				// reset the transactionId for Beacon approach
-				sFESRTransactionId = null;
+		if (oFinishedInteraction) {
+			var sStepName = oFinishedInteraction.semanticStepName ? oFinishedInteraction.semanticStepName : oFinishedInteraction.trigger + "_" + oFinishedInteraction.event;
+			var oFESRHandle = FESR.onBeforeCreated({
+				stepName: sStepName,
+				appNameLong: oFinishedInteraction.stepComponent || oFinishedInteraction.component,
+				appNameShort: oFinishedInteraction.stepComponent || oFinishedInteraction.component,
+				timeToInteractive: oFinishedInteraction.duration,
+				interactionType: determineInteractionType(sStepName)
+			}, oFinishedInteraction);
+
+			// do not send UI-only FESR with piggyback approach
+			if (oBeaconRequest || oFinishedInteraction.requests.length > 0) {
+				createHeader(oFinishedInteraction, oFESRHandle);
+				if (oBeaconRequest) {
+					// reset the transactionId for Beacon approach
+					sFESRTransactionId = null;
+				}
 			}
-		}
 
-		// use the sendBeacon API instead of the piggyback approach
-		if (oBeaconRequest && sFESR && sFESRopt) {
-			oBeaconRequest.append("SAP-Perf-FESRec", sFESR + "SAP-Perf-FESRec-opt" + sFESRopt);
-			sendBeaconRequest();
-		}
+			// use the sendBeacon API instead of the piggyback approach
+			if (oBeaconRequest && sFESR && sFESRopt) {
+				oBeaconRequest.append("SAP-Perf-FESRec", sFESR + "SAP-Perf-FESRec-opt" + sFESRopt);
+				sendBeaconRequest();
+			}
 
-		if (sAppVersionFull != oFinishedInteraction.appVersion) {
-			sAppVersionFull = oFinishedInteraction.appVersion;
-			sAppVersion = sAppVersionFull ? formatVersion(sAppVersionFull) : "";
+			if (sAppVersionFull != oFinishedInteraction.appVersion) {
+				sAppVersionFull = oFinishedInteraction.appVersion;
+				sAppVersion = sAppVersionFull ? formatVersion(sAppVersionFull) : "";
+			}
 		}
 
+		sPassportComponentInfo = "undefined";
 		sPassportAction = "undefined";
 	}
 

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

@@ -83,18 +83,22 @@ sap.ui.define([
 	}
 
 	/**
-	 * Check if request is initiated by XHR
+	 * Check if request is initiated by XHR, comleted and timeframe of request is within timeframe of current interaction
 	 *
-	 * @param {object} oRequestTiming
+	 * @param {object} oRequestTiming PerformanceResourceTiming as retrieved by window.performance.getEntryByType("resource")
+	 * @return {boolean} true if the request is a completed XHR with started and ended within the current interaction
 	 * @private
 	 */
-	function isXHR(oRequestTiming) {
+	function isValidInteractionXHR(oRequestTiming) {
 		// if the request has been completed it has complete timing figures)
 		var bComplete = oRequestTiming.startTime > 0 &&
 			oRequestTiming.startTime <= oRequestTiming.requestStart &&
 			oRequestTiming.requestStart <= oRequestTiming.responseEnd;
 
-		return bComplete && oRequestTiming.initiatorType === "xmlhttprequest";
+		var bPartOfInteraction = oPendingInteraction.start <= (performance.timing.navigationStart + oRequestTiming.requestStart) &&
+			oPendingInteraction.end >= (performance.timing.navigationStart + oRequestTiming.responseEnd);
+
+		return bPartOfInteraction && bComplete && oRequestTiming.initiatorType === "xmlhttprequest";
 	}
 
 	function aggregateRequestTiming(oRequest) {
@@ -155,9 +159,11 @@ sap.ui.define([
 	function finalizeInteraction(iTime) {
 		if (oPendingInteraction) {
 			var aAllRequestTimings = window.performance.getEntriesByType("resource");
+			var oFinshedInteraction;
 			oPendingInteraction.end = iTime;
+			oPendingInteraction.processing = iTime - oPendingInteraction.start;
 			oPendingInteraction.duration = oPendingInteraction.processing;
-			oPendingInteraction.requests = aAllRequestTimings.filter(isXHR);
+			oPendingInteraction.requests = aAllRequestTimings.filter(isValidInteractionXHR);
 			oPendingInteraction.completeRoundtrips = 0;
 			oPendingInteraction.measurements = Measurement.filterMeasurements(isCompleteMeasurement, true);
 			if (oPendingInteraction.requests.length > 0) {
@@ -173,16 +179,18 @@ sap.ui.define([
 			oPendingInteraction.completed = true;
 			Object.freeze(oPendingInteraction);
 
-			if (oPendingInteraction.duration !== 0 || oPendingInteraction.requests.length > 0 || isNavigation) {
+			// Duration threshold 2 in order to filter not performance relevant interactions such as liveChange
+			if (oPendingInteraction.semanticStepName || oPendingInteraction.duration >= 2 || oPendingInteraction.requests.length > 0 || isNavigation) {
 				aInteractions.push(oPendingInteraction);
-				var oFinshedInteraction = aInteractions[aInteractions.length - 1];
-				if (Interaction.onInteractionFinished && oFinshedInteraction) {
-					Interaction.onInteractionFinished(oFinshedInteraction);
-				}
+				oFinshedInteraction = aInteractions[aInteractions.length - 1];
 				if (Log.isLoggable()) {
 					Log.debug("Interaction step finished: trigger: " + oPendingInteraction.trigger + "; duration: " + oPendingInteraction.duration + "; requests: " + oPendingInteraction.requests.length, "Interaction.js");
 				}
 			}
+			// Execute onInteractionFinished always in case function exist to enable cleanup in FESR independent of filtering
+			if (Interaction.onInteractionFinished) {
+				Interaction.onInteractionFinished(oFinshedInteraction);
+			}
 			oPendingInteraction = null;
 			oCurrentBrowserEvent = null;
 			isNavigation = false;
@@ -512,7 +520,6 @@ sap.ui.define([
 				} else {
 					// set provisionary processing time from start to end and calculate later
 					oPendingInteraction.preliminaryEnd = now();
-					oPendingInteraction.processing = oPendingInteraction.preliminaryEnd - oPendingInteraction.start;
 				}
 			}
 		},
@@ -607,12 +614,33 @@ sap.ui.define([
 					if (oPendingInteraction && !oPendingInteraction.completed && Interaction.onInteractionStarted) {
 						oPendingInteraction.passportAction = Interaction.onInteractionStarted(oPendingInteraction, bForce);
 					}
+					// Interaction.start will delete oCurrentBrowserEvent in case there is an oPendingInteraction
+					// (notifyStepStart is called with parameter bForce)
+					// Conscious decision to not move the coding because this shouldn't be a productive scenario
 					if (oCurrentBrowserEvent) {
 						oBrowserElement = oCurrentBrowserEvent.srcControl;
 					}
 					// if browser event matches the first control event we take it for trigger/event determination (step name)
 					if (oElement && oElement.getId && oBrowserElement && oElement.getId() === oBrowserElement.getId()) {
 						bMatched = true;
+					} else {
+						var elem = oBrowserElement;
+						while (elem && elem.getParent()) {
+							elem = elem.getParent();
+							if (oElement.getId() === elem.getId()) {
+								// Stop looking for better fitting control in case the current browser event source control
+								// is already child of the control event which triggers the interaction because all other
+								// control events most likely does not suit better.
+								// Example: Click on image of an button will not pass the previous if
+								// (oElement.getId() !== oBrowserElement.getId() ==> btn !== btn-img).
+								// In case the button is part of an popover and the click on the button closes the popover,
+								// the coding below overwrites the button control id with the popover control id in case we
+								// don't stop here.
+								// Only look for better fitting control in case browser and control event does not fit at all
+								bMatched = true;
+								break;
+							}
+						}
 					}
 					oCurrentBrowserEvent = null;
 					//only handle the first browser event within a call stack. Ignore virtual/harmonization events.
@@ -623,6 +651,8 @@ sap.ui.define([
 						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
 				} else if (oPendingInteraction && oBrowserElement && !bMatched) {
 					// if browser event matches one of the next control events we take it for trigger/event determination (step name)
 					var elem = oBrowserElement;
@@ -630,13 +660,13 @@ sap.ui.define([
 						oPendingInteraction.trigger = oElement.getId();
 						oPendingInteraction.semanticStepName = FESRHelper.getSemanticStepname(oElement, sEventId);
 						oPendingInteraction.event = sEventId;
-					    bMatched = true;
+						bMatched = true;
 					} else {
 						while (elem && elem.getParent()) {
 							elem = elem.getParent();
 							if (oElement.getId() === elem.getId()) {
-						oPendingInteraction.trigger = oElement.getId();
-						oPendingInteraction.semanticStepName = FESRHelper.getSemanticStepname(oElement, sEventId);
+								oPendingInteraction.trigger = oElement.getId();
+								oPendingInteraction.semanticStepName = FESRHelper.getSemanticStepname(oElement, sEventId);
 								oPendingInteraction.event = sEventId;
 								//if we find no direct match we consider the last control event for the trigger/event (step name)
 								break;
@@ -652,7 +682,7 @@ sap.ui.define([
 		 * Register async operation, that is relevant for a running interaction.
 		 * Invoking the returned handle stops the async operation.
 		 *
-		 * @params {string} sStepName a step name
+		 * @param {string} sStepName a step name
 		 * @returns {function} The async handle
 		 * @private
 		 */
@@ -664,6 +694,7 @@ sap.ui.define([
 				}
 				/*eslint-enable no-console */
 				var sInteractionId = oPendingInteraction.id;
+				delete oPendingInteraction.preliminaryEnd; // Delete prelimanry end to force current timestamp of finalization
 				Interaction.notifyAsyncStepStart();
 				return function() {
 					Interaction.notifyAsyncStepEnd(sInteractionId);
@@ -730,7 +761,10 @@ sap.ui.define([
 						if (iInteractionStepTimer) {
 							clearTimeout(iInteractionStepTimer);
 						}
-						iInteractionStepTimer = setTimeout(Interaction.notifyStepEnd, 250);
+						// There are control events using a debouncing mechanism for e.g. suggest event (see sap.m.Input)
+						// A common debounce treshhold (also used by sap.m.Input) is 300ms therefore we use setTimeout
+						// with 301ms to end the Interaction after execution of the debounced event
+						iInteractionStepTimer = setTimeout(Interaction.notifyStepEnd, 301);
 						if (Log.isLoggable()) {
 							Log.debug("Interaction check for idle time - Number of pending steps: " + iInteractionCounter);
 						}
@@ -774,6 +808,22 @@ sap.ui.define([
 				if (oCurrentBrowserEvent.type.match(/^(mousedown|touchstart|keydown)$/)) {
 					Interaction.end(/*bForce*/true);
 				}
+				// Clean up oCurrentBrowserEvent at the end to prevent dangling events
+				// Since oCurrentBrowser event is prerequisite to start an event we need to
+				// clean dangling browser events to avoid creating interactions based on these events
+				// e.g. The user clicks first somewhere on the UI on a control without press handler.
+				// After that the user scrolls in a table and triggers implicit requests via paging.
+				// This combination will create an interaction based on the first browser event,
+				// created and not cleaned up by the first click within the UI
+				if (this.eventEndTimer) {
+					clearTimeout(this.eventEndTimer);
+				}
+				this.eventEndTimer = setTimeout(function() {
+					oCurrentBrowserEvent = null;
+					delete this.eventEndTimer;
+				// There are events fired within a timeout with delay. Cleanup after 10ms
+				// to hopefully prevent cleaning up to early (before control event was fired)
+				}.bind(this), 10);
 			}
 		},
 

package/src/sap/ui/qunit/sinon-qunit-bridge.js

@@ -85,7 +85,7 @@
 					useFakeTimers: bUseFakeTimers
 				};
 
-				if (sinon.createSandBox) {
+				if (sinon.createSandbox) {
 					this._oSandbox = sinon.createSandbox(oSandboxConfig);
 				} else {
 					this._oSandbox = sinon.sandbox.create(oSandboxConfig);

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

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

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

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core'
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @public
 	 * @since 1.48.0

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

@@ -860,7 +860,7 @@ sap.ui.define([
 		/**
 		 * Returns the QUnit utils object in the current context. If an iframe is launched, it will return the iframe's QUnit utils.
 		 * @public
-		 * @returns {sap.ui.test.qunit} The QUnit utils
+		 * @returns {object} The QUnit utils
 		 */
 		Opa5.getUtils = function () {
 			return iFrameLauncher.getUtils() || QUnitUtils;