@openui5/sap.m 1.126.1 → 1.128.0

package/src/sap/m/IllustratedMessage.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Illustration.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Image.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @borrows sap.ui.core.IFormContent.getFormDoNotAdjustWidth as #getFormDoNotAdjustWidth
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @public
 	 * @alias sap.m.Image

package/src/sap/m/ImageContent.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @since 1.38
 	 *
 	 * @public

package/src/sap/m/Input.js

@@ -162,7 +162,7 @@ function(
 	 * @extends sap.m.InputBase
 	 * @implements sap.ui.core.IAccessKeySupport
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -172,8 +172,7 @@ function(
 	var Input = InputBase.extend("sap.m.Input", /** @lends sap.m.Input.prototype */ {
 		metadata : {
 			interfaces : [
-				"sap.ui.core.IAccessKeySupport",
-				"sap.m.IToolbarInteractiveControl"
+				"sap.ui.core.IAccessKeySupport"
 			],
 			library : "sap.m",
 			properties : {
@@ -473,7 +472,12 @@ function(
 						/**
 						 * The event parameter is set to true, when the button at the end of the suggestion table is clicked, otherwise false. It can be used to determine whether the "value help" trigger or the "show all items" trigger has been pressed.
 						 */
-						fromSuggestions : {type : "boolean"}
+						fromSuggestions : {type : "boolean"},
+
+						/**
+						 * The event parameter is set to true, when the event is fired after keyboard interaction, otherwise false.
+						 */
+						fromKeyboard: {type: "boolean"}
 					}
 				},
 
@@ -1171,7 +1175,7 @@ function(
 
 					that.bValueHelpRequested = true;
 
-					that._fireValueHelpRequest(false);
+					that._fireValueHelpRequest(false, false);
 				}
 			});
 		} else if (this._oValueHelpIcon.getSrc() !== sIconSrc) {
@@ -1226,7 +1230,7 @@ function(
 	 *
 	 * @private
 	 */
-	Input.prototype._fireValueHelpRequest = function(bFromSuggestions) {
+	Input.prototype._fireValueHelpRequest = function(bFromSuggestions, bFromKeyboard) {
 
 		// The goal is to provide a value in the value help event, which can be used to filter the opened Value Help Dialog.
 		var sTypedInValue = "";
@@ -1239,6 +1243,7 @@ function(
 
 		this.fireValueHelpRequest({
 			fromSuggestions: bFromSuggestions,
+			fromKeyboard: bFromKeyboard,
 			_userInputValue: sTypedInValue // NOTE: Private parameter for the SmartControls which need only the value entered by the user.
 		});
 	};
@@ -1967,6 +1972,7 @@ function(
 	 *
 	 * @param {int} iNumItems
 	 * @private
+	 * @ui5-restricted sap.ui.mdc
 	 */
 	Input.prototype._applySuggestionAcc = function(iNumItems) {
 		var sAriaText = "",
@@ -2407,7 +2413,7 @@ function(
 		}
 
 		this.bValueHelpRequested = true;
-		this._fireValueHelpRequest(false);
+		this._fireValueHelpRequest(false, true);
 		oEvent.preventDefault();
 		oEvent.stopPropagation();
 	};
@@ -2421,7 +2427,7 @@ function(
 	 * @param {jQuery.Event} oEvent Keyboard event.
 	 */
 	Input.prototype.onsapselect = function(oEvent) {
-		this._fireValueHelpRequestForValueHelpOnly();
+		this._fireValueHelpRequestForValueHelpOnly(false, true);
 	};
 
 	/**
@@ -2761,7 +2767,7 @@ function(
 				this._setTypedInValue(sTempTypedInValue);
 			}
 
-			this._fireValueHelpRequest(true);
+			this._fireValueHelpRequest(true, false);
 			this._closeSuggestionPopup();
 		}
 	};
@@ -3589,19 +3595,6 @@ function(
 		return this._sProposedItemText;
 	};
 
-	/**
-	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
-	 * Determines if the Control is interactive.
-	 *
-	 * @returns {boolean} If it is an interactive Control
-	 *
-	 * @private
-	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
-	 */
-	Input.prototype._getToolbarInteractive = function () {
-		return true;
-	};
-
 	// support for SemanticFormElement
 	Input.prototype.getFormFormattedValue = function() {
 		var sValue = this.getValue();
@@ -3618,7 +3611,6 @@ function(
 		return ["value", "description"];
 	};
 
-
 	/**
 	 * Check if the current value is matching with a suggestion item.
 	 *

package/src/sap/m/InputBase.js

@@ -73,7 +73,7 @@ function(
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -85,7 +85,8 @@ function(
 
 			interfaces : [
 				"sap.ui.core.IFormContent",
-				"sap.ui.core.ISemanticFormContent"
+				"sap.ui.core.ISemanticFormContent",
+				"sap.m.IToolbarInteractiveControl"
 			],
 			library: "sap.m",
 			properties: {
@@ -1344,6 +1345,19 @@ function(
 		return false;
 	};
 
+	/**
+	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
+	 * Determines if the Control is interactive.
+	 *
+	 * @returns {boolean} If it is an interactive Control
+	 *
+	 * @private
+	 * @ui5-restricted sap.m.OverflowToolBar, sap.m.Toolbar
+	 */
+	InputBase.prototype._getToolbarInteractive = function () {
+		return true;
+	};
+
 	return InputBase;
 
 });

package/src/sap/m/InputListItem.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Label.js

@@ -78,7 +78,7 @@ function(
 	 * @implements sap.ui.core.Label, sap.ui.core.IShrinkable, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBox.js

@@ -96,7 +96,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/LightBoxItem.js

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Link.js

@@ -14,11 +14,14 @@ sap.ui.define([
 	"sap/ui/core/AccessKeysEnablement",
 	"sap/ui/core/LabelEnablement",
 	"sap/ui/core/Lib",
+	"sap/ui/core/Icon",
+	"sap/ui/core/IconPool",
 	"sap/ui/core/library",
 	"sap/ui/Device",
 	"./LinkRenderer",
 	"sap/ui/events/KeyCodes",
-	"sap/base/security/URLListValidator"
+	"sap/base/security/URLListValidator",
+	"sap/base/Log"
 ],
 function(
 	library,
@@ -29,11 +32,14 @@ function(
 	AccessKeysEnablement,
 	LabelEnablement,
 	Library,
+	Icon,
+	IconPool,
 	coreLibrary,
 	Device,
 	LinkRenderer,
 	KeyCodes,
-	URLListValidator
+	URLListValidator,
+	Log
 ) {
 	"use strict";
 
@@ -93,7 +99,7 @@ function(
 	 * @borrows sap.ui.core.ISemanticFormContent.getFormRenderAsControl as #getFormRenderAsControl
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -120,6 +126,26 @@ function(
 				 */
 				text : {type : "string", group : "Data", defaultValue : ''},
 
+				/**
+				 * Defines the icon to be displayed as graphical element in the beginning of the <code>Link</code>.
+				 * It can be an icon from the icon font.
+				 * <b>Note:</b> Usage of icon-only link is not supported, the link must always have a text.
+				 * <b>Note:</b> We recommend using аn icon in the beginning or the end only, and always with text.
+				 * <b>Note:</b> Using an image instead of icon is not supported.
+				 * @since 1.128.0
+				 */
+				icon : {type : "sap.ui.core.URI", group : "Appearance", defaultValue: "" },
+
+				/**
+				 * Defines the icon to be displayed as graphical element in the end of the <code>Link</code>.
+				 * It can be an icon from the icon font.
+				 * <b>Note:</b> Usage of icon-only link is not supported, the link must always have a text.
+				 * <b>Note:</b> We recommend using аn icon in the beginning or the end only, and always with text.
+				 * <b>Note:</b> Using an image instead of icon is not supported.
+				 * @since 1.128.0
+				 */
+				endIcon : {type : "sap.ui.core.URI", group : "Appearance", defaultValue: "" },
+
 				/**
 				 * Determines whether the link can be triggered by the user.
 				 */
@@ -243,6 +269,21 @@ function(
 				 */
 				accesskey: { type: "string", defaultValue: "", visibility: "hidden" }
 			},
+			aggregations: {
+
+				/**
+				 * The icon control to be displayed as graphical element in the beginning of the <code>Link</code>.
+				 * @since 1.128.0
+				 */
+				_icon: {type: "sap.ui.core.Icon", multiple: false, visibility: "hidden"},
+
+				/**
+				 * The icon control to be displayed as graphical element at the end of the <code>Link</code>.
+				 * @since 1.128.0
+				 */
+				_endIcon: {type: "sap.ui.core.Icon", multiple: false, visibility: "hidden"}
+
+			},
 			associations : {
 
 				/**
@@ -328,6 +369,9 @@ function(
 	};
 
 	Link.prototype.exit = function() {
+		var oIcon = this.getAggregation("_icon"),
+			oEndIcon = this.getAggregation("_endIcon");
+
 		if (Device.system.phone || Device.system.tablet) {
 			var oAnchorElement = this.getDomRef();
 			if (!oAnchorElement) {
@@ -335,6 +379,16 @@ function(
 			}
 			oAnchorElement.removeEventListener("click", this._onClick);
 		}
+
+		if (oIcon) {
+			oIcon.destroy();
+			oIcon = null;
+		}
+
+		if (oEndIcon) {
+			oEndIcon.destroy();
+			oEndIcon = null;
+		}
 	};
 
 	Link.prototype._onClick = function(oEvent) {
@@ -399,7 +453,6 @@ function(
 		}
 	};
 
-
 	/**
 	 * Handler for the <code>press</code> event of the link.
 	 *
@@ -414,7 +467,7 @@ function(
 			// mark the event for components that needs to know if the event was handled by the link
 			oEvent.setMarked();
 
-			bEmptyHref = oTarget.classList.contains("sapMLnk") && oTarget.getAttribute("href") == "#";
+			bEmptyHref = (oTarget.classList.contains("sapMLnk") || oTarget.parentElement.classList.contains("sapMLnk")) && (oTarget.getAttribute("href") == "#" || oTarget.parentElement.getAttribute("href") == "#");
 			if (!this.firePress({ctrlKey: !!oEvent.ctrlKey, metaKey: !!oEvent.metaKey}) || bEmptyHref) { // fire event and check return value whether default action should be prevented
 				oEvent.preventDefault();
 			}
@@ -467,6 +520,32 @@ function(
 		return this;
 	};
 
+	Link.prototype.setIcon = function(sSrc) {
+		if (!IconPool.isIconURI(sSrc)) {
+			Log.error("setIcon: The provided URI ' + sSrc + ' is is not a valid Icon URI!");
+		} else {
+			var oIcon = this._getIcon();
+
+			oIcon.setSrc(sSrc);
+			this.setProperty("icon", sSrc);
+		}
+
+		return this;
+	};
+
+	Link.prototype.setEndIcon = function(sSrc) {
+		if (!IconPool.isIconURI(sSrc)) {
+			Log.error("setEndIcon: The provided URI ' + sSrc + ' is is not a valid Icon URI!");
+		} else {
+			var oIcon = this._getEndIcon();
+
+			oIcon.setSrc(sSrc);
+			this.setProperty("endIcon", sSrc);
+		}
+
+		return this;
+	};
+
 	/*************************************** Static members ******************************************/
 
 	/**
@@ -591,6 +670,42 @@ function(
 		return true;
 	};
 
+	/**
+	 * Returns the icon control instance of the icon displayed in the beginning of the link. If it is not yet created, it will be created.
+	 * @private
+	 * @returns {sap.ui.core.Icon} icon control instance of the icon displayed in the beginning of the link
+	 */
+	Link.prototype._getIcon = function () {
+		var oIcon = this.getAggregation("_icon");
+
+		if (!oIcon) {
+			oIcon = new Icon(this.getId() + "-icon", {
+				useIconTooltip: false
+			}).addStyleClass("sapMLnkIcon");
+			this.setAggregation("_icon", oIcon);
+		}
+
+		return oIcon;
+	};
+
+	/**
+	 * Returns the icon control instance of the icon displayed at the end of the link. If it is not yet created, it will be created.
+	 * @private
+	 * @returns {sap.ui.core.Icon} icon control instance of the icon displayed at the end of the link
+	 */
+	Link.prototype._getEndIcon = function () {
+		var oIcon = this.getAggregation("_endIcon");
+
+		if (!oIcon) {
+			oIcon = new Icon(this.getId() + "-endIcon", {
+				useIconTooltip: false
+			}).addStyleClass("sapMLnkEndIcon");
+			this.setAggregation("_endIcon", oIcon);
+		}
+
+		return oIcon;
+	};
+
 	return Link;
 
 });

package/src/sap/m/LinkRenderer.js

@@ -59,6 +59,7 @@
 			},
 			bEnabled = oControl.getEnabled(),
 			sTypeSemanticInfo = "",
+			sText = oControl.getText(),
 			sAcccessKey = oControl.getProperty("accesskey");
 
 		// Link is rendered as a "<a>" element
@@ -143,12 +144,29 @@
 		// opening <a> tag
 		oRm.openEnd();
 
+		// Render icon only if there is text
+		if (sText && oControl.getIcon()) {
+			oRm.renderControl(oControl._getIcon());
+		}
+
+		// Text is rendered in "<span>" element to apply ellipsis only on the text
+		oRm.openStart("span");
+		oRm.class("sapMLnkText");
+		oRm.openEnd();
+
 		if (this.writeText) {
 			this.writeText(oRm, oControl);
 		} else {
 			this.renderText(oRm, oControl);
 		}
 
+		oRm.close("span");
+
+		// Render end icon only if there is text
+		if (sText && oControl.getEndIcon()) {
+			oRm.renderControl(oControl._getEndIcon());
+		}
+
 		oRm.close("a");
 	};
 

package/src/sap/m/LinkTileContent.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @class This element is used within the GenericTile control that generates a combination of an icon and a linkl
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @public
 	 * @since 1.120

package/src/sap/m/List.js

@@ -30,7 +30,7 @@ sap.ui.define(["./library", "./ListBase", "./ListRenderer"],
 	 * @extends sap.m.ListBase
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ListBase.js

@@ -103,7 +103,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @public
@@ -251,7 +251,7 @@ function(
 				/**
 				 * If set to true, this control remembers and retains the selection of the items after a binding update has been performed (e.g. sorting, filtering).
 				 * <b>Note:</b> This feature works only if two-way data binding for the <code>selected</code> property of the item is not used. It also needs to be turned off if the binding context of the item does not always point to the same entry in the model, for example, if the order of the data in the <code>JSONModel</code> is changed.
-				 * <b>Note:</b> This feature leverages the built-in selection mechanism of the corresponding binding context when the OData V4 model is used. Therefore, all binding-relevant limitations apply in this context as well. For more details, see the {@link sap.ui.model.odata.v4.Context#setSelected setSelected}, the {@link sap.ui.model.odata.v4.ODataModel#bindList bindList}, and the {@link sap.ui.model.odata.v4.ODataMetaModel#requestValueListInfo requestValueListInfo} API documentation. Do not enable this feature when <code>$$SharedRequests</code> is active.
+				 * <b>Note:</b> This feature leverages the built-in selection mechanism of the corresponding binding context when the OData V4 model is used. Therefore, all binding-relevant limitations apply in this context as well. For more details, see the {@link sap.ui.model.odata.v4.Context#setSelected setSelected}, the {@link sap.ui.model.odata.v4.ODataModel#bindList bindList}, and the {@link sap.ui.model.odata.v4.ODataMetaModel#requestValueListInfo requestValueListInfo} API documentation. Do not enable this feature when <code>$$SharedRequests</code> or <code>$$clearSelectionOnFilter</code> is active.
 				 * @since 1.16.6
 				 */
 				rememberSelections : {type : "boolean", group : "Behavior", defaultValue : true},
@@ -628,6 +628,7 @@ function(
 		this._aSelectedPaths = [];
 		this._destroyGrowingDelegate();
 		this._destroyItemNavigation();
+		this._oLastFakeFocusedItem = null;
 	};
 
 	// this gets called only with oData Model when first load or filter/sort
@@ -758,6 +759,10 @@ function(
 		}
 
 		Control.prototype._bindAggregation.call(this, sName, oBindingInfo);
+
+		if (sName === "items" && this.getModel(oBindingInfo.model).isA("sap.ui.model.odata.v4.ODataModel")) {
+			this.getBinding("items").attachEvent("selectionChanged", onBindingSelectionChanged, this);
+		}
 	};
 
 	ListBase.prototype._onBindingDataRequestedListener = function(oEvent) {
@@ -790,6 +795,44 @@ function(
 		}
 	};
 
+	async function onBindingSelectionChanged(oEvent) {
+		const oContext = oEvent.getParameter("context");
+
+		if (!this._bSelectionMode) {
+			return;
+		}
+
+		if (oContext.getBinding().getHeaderContext() === oContext) {
+			if (oContext.isSelected()) {
+				Log.warning("Selecting the header context does not affect the list selection", this);
+			} else {
+				this.removeSelections(true, true);
+			}
+			return;
+		}
+
+		const sModelName = this.getBindingInfo("items").model;
+		const oItem = this.getItems().find((oItem) => oItem.getBindingContext(sModelName) === oContext);
+
+		if (!oItem) {
+			Log.warning("Selecting a context that is not related to a visible item does not affect the list selection", this);
+			return;
+		}
+
+		await Promise.resolve(); // ListItemBase first needs to update its selected property, otherwise the selectionChange event is fired too often.
+
+		const bContextIsSelected = oContext.isSelected();
+		this.setSelectedItem(oItem, bContextIsSelected, bContextIsSelected !== oItem.getSelected());
+
+		if (bContextIsSelected && this.getMode().includes("SingleSelect")) {
+			oContext.getBinding().getAllCurrentContexts().forEach((oCurrentContext) => {
+				if (oCurrentContext !== oContext) {
+					oCurrentContext.setSelected(false);
+				}
+			});
+		}
+	}
+
 	ListBase.prototype.destroyItems = function(bSuppressInvalidate) {
 		// check whether we have items to destroy or not
 		if (!this.getItems(true).length) {
@@ -2127,31 +2170,68 @@ function(
 			this.getNavigationRoot().setAttribute("aria-activedescendant", oItemDomRef.id);
 		} else {
 			// prepare the announcement for the screen reader
-			var oAccInfo = oItem.getAccessibilityInfo(),
-				oBundle = Library.getResourceBundleFor("sap.m"),
-				sDescription = oAccInfo.type ? oAccInfo.type + " . " : "";
+			this.setInvisibleTextAssociation(oItem);
+		}
+	};
 
-			if (this.isA("sap.m.Table")) {
-				var mPosition = this.getAccessbilityPosition(oItem);
-				sDescription += oBundle.getText("LIST_ITEM_POSITION", [mPosition.posinset, mPosition.setsize]) + " . ";
-			}
+	/**
+	 * For the specified list item it updates the invisible text and sets the aria-labelledby association.
+	 *
+	 * @param {sap.m.ListItemBase} oItem The list item whose invisible text association should be set
+	 * @private
+	 */
+	ListBase.prototype.setInvisibleTextAssociation = function(oItem) {
+		var oAccInfo = oItem.getAccessibilityInfo(),
+			oBundle = Library.getResourceBundleFor("sap.m"),
+			sDescription = oAccInfo.type ? oAccInfo.type + " . " : "";
 
-			sDescription += oAccInfo.description;
-			this.updateInvisibleText(sDescription, oItemDomRef);
-			return sDescription;
+		if (this.isA("sap.m.Table")) {
+			var mPosition = this.getAccessbilityPosition(oItem);
+			sDescription += oBundle.getText("LIST_ITEM_POSITION", [mPosition.posinset, mPosition.setsize]) + " . ";
 		}
+
+		sDescription += oAccInfo.description;
+		this.updateInvisibleText(sDescription, oItem.getDomRef());
 	};
 
 	ListBase.prototype.onItemFocusOut = function(oItem) {
 		this.removeInvisibleTextAssociation(oItem.getDomRef());
 	};
 
+	/**
+	 * For the specified <code>HTMLElement</code> it removes the aria-labelledby association to the invisible text.
+	 *
+	 * @param {HTMLElement} oDomRef The <code>HTMLElement</code> whose invisible text association should be removed
+	 * @private
+	 */
 	ListBase.prototype.removeInvisibleTextAssociation = function(oDomRef) {
 		const oInvisibleText = ListBase.getInvisibleText(),
 			$FocusedItem = jQuery(oDomRef || document.activeElement);
 		$FocusedItem.removeAriaLabelledBy(oInvisibleText.getId());
 	};
 
+	/**
+	 * It simulates focus by adding the corresponding style classes and updating the invisible text association.
+	 * <b>Note</b>: Fake focus is not set when the real focus is inside the list. If the fake focus is set, it gets removed when the real focus lands inside the list.
+	 *
+	 * @param {sap.m.ListItemBase|null} oItem The list item to receive fake focus, null to remove it
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
+	 */
+	ListBase.prototype.setFakeFocus = function(oItem) {
+		if (this._oLastFakeFocusedItem) {
+			this._oLastFakeFocusedItem.removeStyleClass("sapMLIBFocused");
+			this.removeInvisibleTextAssociation(this._oLastFakeFocusedItem.getDomRef());
+			this._oLastFakeFocusedItem = null;
+		}
+
+		if (oItem && !this.getDomRef().contains(document.activeElement)) {
+			this._oLastFakeFocusedItem = oItem;
+			oItem.addStyleClass("sapMLIBFocused");
+			this.setInvisibleTextAssociation(oItem);
+		}
+	};
+
 	ListBase.prototype.updateInvisibleText = function(sText, oItemDomRef, bPrepend) {
 		var oInvisibleText = ListBase.getInvisibleText(),
 			$FocusedItem = jQuery(oItemDomRef || document.activeElement);
@@ -2482,7 +2562,6 @@ function(
 
 	// Handles focus to reposition the focus to correct place
 	ListBase.prototype.onfocusin = function(oEvent) {
-
 		// ignore self focus
 		if (this._bIgnoreFocusIn) {
 			this._bIgnoreFocusIn = false;
@@ -2495,6 +2574,10 @@ function(
 			this._startItemNavigation();
 		}
 
+		if (this._oLastFakeFocusedItem) {
+			this.setFakeFocus(null);
+		}
+
 		var oTarget = oEvent.target;
 		if (oTarget.id == this.getId("nodata")) {
 			var vNoData = this.getNoData();