@openui5/sap.m 1.91.0 → 1.93.2

package/src/sap/m/IconTabBarSelectListRenderer.js

@@ -6,12 +6,11 @@
 
 // Provides default renderer for control sap.m.IconTabBarSelectList
 sap.ui.define([
-	"sap/ui/core/theming/Parameters",
 	"sap/ui/core/library"
-], function (Parameters, coreLibary) {
+], function (coreLibrary) {
 	"use strict";
 
-	var IconColor = coreLibary.IconColor;
+	var IconColor = coreLibrary.IconColor;
 
 	/**
 	 * IconTabBarSelectList renderer.
@@ -22,20 +21,19 @@ sap.ui.define([
 		apiVersion: 2
 	};
 
-	IconTabBarSelectListRenderer.fNestedItemPaddingLeft = Number.parseFloat(Parameters.get("_sap_m_IconTabBar_SelectListItem_PaddingLeft"));
-
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM the RenderManager that can be used for writing to the Render-Output-Buffer
-	 * @param {sap.m.IconTabBarSelectList} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.IconTabBarSelectList} oSelectList an object representation of the control that should be rendered
 	 */
 	IconTabBarSelectListRenderer.render = function(oRM, oSelectList) {
-		var aItems = oSelectList.getVisibleItems(),
+		var mParams = oSelectList._getParams(),
+			aItems = oSelectList.getVisibleItems(),
 			oIconTabHeader = oSelectList._oIconTabHeader,
 			bTextOnly = oIconTabHeader._checkTextOnly(),
 			iTotalItemsCount = oIconTabHeader.getVisibleTabFilters().length,
-			fNestedItemPaddingLeft = this.fNestedItemPaddingLeft,
+			fNestedItemPaddingLeft = mParams.fNestedItemPaddingLeft,
 			bExtraIndent = false;
 
 		// find if in that level of nesting there is some semantic icon set
@@ -46,7 +44,7 @@ sap.ui.define([
 
 		oSelectList.checkIconOnly();
 
-		var fAdditionalPadding = Number.parseFloat(Parameters.get("_sap_m_IconTabBar_SelectListItem_PaddingLeftAdditional"));
+		var fAdditionalPadding = mParams.fAdditionalPadding;
 		if (bHasSemanticColor && fAdditionalPadding) {
 			fNestedItemPaddingLeft += fAdditionalPadding;
 			bExtraIndent = true;

package/src/sap/m/IconTabFilter.js

@@ -15,7 +15,6 @@ sap.ui.define([
 	"sap/ui/core/Renderer",
 	"sap/ui/core/IconPool",
 	'sap/ui/core/InvisibleMessage',
-	"sap/ui/core/InvisibleText",
 	'sap/ui/Device',
 	"sap/m/BadgeCustomData",
 	"sap/m/Button",
@@ -32,7 +31,6 @@ sap.ui.define([
 	Renderer,
 	IconPool,
 	InvisibleMessage,
-	InvisibleText,
 	Device,
 	BadgeCustomData,
 	Button,
@@ -69,6 +67,9 @@ sap.ui.define([
 	// shortcut for sap.ui.core.IconColor
 	var IconColor = coreLibrary.IconColor;
 
+	// shortcut for sap.ui.core.aria.HasPopup
+	var AriaHasPopup = coreLibrary.aria.HasPopup;
+
 	/**
 	 * The time between tab activation and the disappearance of the badge.
 	 * @constant {int}
@@ -78,6 +79,8 @@ sap.ui.define([
 	// shortcut for sap.ui.core.InvisibleMessageMode
 	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
 
+	var POPOVER_OFFSET_Y_TOOL_HEADER = -8;
+
 	/**
 	 * Constructor for a new IconTabFilter.
 	 *
@@ -91,7 +94,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -183,7 +186,8 @@ sap.ui.define([
 			 */
 			_expandButton : {type : "sap.m.Button", multiple : false, visibility : "hidden"},
 
-			/** The badge of the expand button
+			/**
+			 * The badge of the expand button
 			 * @since 1.83
 			 */
 			_expandButtonBadge : {type : "sap.ui.core.Control", multiple : false, visibility : "hidden"}
@@ -271,11 +275,6 @@ sap.ui.define([
 			Item.prototype.exit.call(this, oEvent);
 		}
 
-		if (this._invisibleText) {
-			this._invisibleText.destroy();
-			this._invisibleText = null;
-		}
-
 		if (this._oPopover) {
 			this._oPopover.destroy();
 			this._oPopover = null;
@@ -433,7 +432,7 @@ sap.ui.define([
 			oIcon = this.getIcon(),
 			sIconColor = this.getIconColor(),
 			bEnabled = this.getEnabled(),
-			bShouldReadIconColor = bEnabled && (sIconColor == "Positive" || sIconColor == "Critical" || sIconColor == "Negative" || sIconColor == "Neutral"),
+			bShouldReadIconColor = this._shouldReadIconColor(),
 			bHorizontalDesign = this.getDesign() === IconTabFilterDesign.Horizontal,
 			bTextOnly = oIconTabHeader._bTextOnly,
 			bInLine = oIconTabHeader._bInLine || oIconTabHeader.isInlineMode(),
@@ -527,6 +526,10 @@ sap.ui.define([
 
 		oRM.openEnd();
 
+		if (bShouldReadIconColor) {
+			this._renderIconColorDescription(oRM);
+		}
+
 		oRM.openStart("div")
 			.class("sapMITBFilterWrapper")
 			.openEnd();
@@ -537,14 +540,6 @@ sap.ui.define([
 				.openEnd();
 
 			if (!bShowAll || !oIcon) {
-				if (bShouldReadIconColor) {
-					oRM.openStart("div", sId + "-iconColor")
-						.style("display", "none")
-						.openEnd()
-						.text(oResourceBundle.getText("ICONTABBAR_ICONCOLOR_" + sIconColor.toUpperCase()))
-						.close("div");
-				}
-
 				var aCssClasses = ["sapMITBFilterIcon", "sapMITBBadgeHolder"];
 				if (bEnabled) {
 					aCssClasses.push("sapMITBFilter" + sIconColor);
@@ -603,6 +598,10 @@ sap.ui.define([
 
 			oRM.openEnd();
 
+			if (bInLine && oIcon) {
+				this._renderIcon(oRM);
+			}
+
 			oRM.openStart("span")
 				.class("sapMITHTextContent")
 				.attr("dir", sTextDir !== TextDirection.Inherit ? sTextDir.toLowerCase() : "auto");
@@ -658,11 +657,6 @@ sap.ui.define([
 	 * @protected
 	 */
 	IconTabFilter.prototype.renderInSelectList = function (oRM, oSelectList, iIndexInSet, iSetSize, fPaddingValue) {
-		if (this._invisibleText) {
-			this._invisibleText.destroy();
-			this._invisibleText = null;
-		}
-
 		if (!this.getVisible()) {
 			return;
 		}
@@ -717,7 +711,7 @@ sap.ui.define([
 		}
 
 		var sItemId = this.getId(),
-			bShouldReadIconColor = bEnabled && (sIconColor == "Positive" || sIconColor == "Critical" || sIconColor == "Negative" || sIconColor == "Neutral"),
+			bShouldReadIconColor = this._shouldReadIconColor(),
 			aLabelledByIds = [];
 
 		if (!bIconOnly) {
@@ -729,18 +723,14 @@ sap.ui.define([
 		}
 
 		if (bShouldReadIconColor) {
-			this._invisibleText = new InvisibleText({
-				text: oResourceBundle.getText('ICONTABBAR_ICONCOLOR_' + sIconColor.toUpperCase())
-			});
-
-			aLabelledByIds.push(this._invisibleText.getId());
+			aLabelledByIds.push(sItemId + "-iconColor");
 		}
 
 		oRM.accessibilityState({ labelledby: aLabelledByIds.join(" ") })
 			.openEnd();
 
-		if (this._invisibleText) {
-			oRM.renderControl(this._invisibleText);
+		if (bShouldReadIconColor) {
+			this._renderIconColorDescription(oRM);
 		}
 
 		if (!bTextOnly) {
@@ -779,6 +769,10 @@ sap.ui.define([
 				aClasses.push("sapMITBBadgeHolder");
 			}
 
+			if (this._getIconTabHeader().isInlineMode()) {
+				aClasses.push("sapMITBInlineIcon");
+			}
+
 			oRM.icon(oIcon, aClasses, {
 				id: this.getId() + "-icon",
 				"aria-hidden": true
@@ -788,6 +782,14 @@ sap.ui.define([
 		}
 	};
 
+	IconTabFilter.prototype._renderIconColorDescription = function (oRM) {
+		oRM.openStart("div", this.getId() + "-iconColor")
+			.style("display", "none")
+			.openEnd()
+			.text(oResourceBundle.getText("ICONTABBAR_ICONCOLOR_" + this.getIconColor().toUpperCase()))
+			.close("div");
+	};
+
 	/**
 	 * Renders text in SelectList.
 	 * @private
@@ -835,7 +837,7 @@ sap.ui.define([
 			});
 			this._oSelectList._oIconTabHeader = this.getParent();
 			this._oSelectList._oTabFilter = this;
-			this._oSelectList._bIsOverflow = this._isOverflow;
+			this._oSelectList._bIsOverflow = this._isOverflow();
 		}
 		return this._oSelectList;
 	};
@@ -855,6 +857,19 @@ sap.ui.define([
 		}
 	};
 
+	IconTabFilter.prototype._updateTabCountText = function () {
+		if (!this._isOverflow()) {
+			return;
+		}
+
+		var iTabFilters = this._getIconTabHeader()
+			._getItemsForOverflow(this._bIsStartOverflow)
+			.filter(function (oItem) { return oItem.isA("sap.m.IconTabFilter"); })
+			.length;
+
+		this.setText("+" + iTabFilters);
+	};
+
 	/**
 	 * Returns the expand button for this instance.
 	 * This button is conditionally shown in the DOM
@@ -870,6 +885,7 @@ sap.ui.define([
 				icon: IconPool.getIconURI("slim-arrow-down"),
 				tooltip: oResourceBundle.getText("ICONTABHEADER_OVERFLOW_MORE"),
 				tabIndex: "-1",
+				ariaHasPopup: AriaHasPopup.Menu,
 				press: this._expandButtonPress.bind(this)
 			}).addStyleClass("sapMITBFilterExpandBtn");
 
@@ -931,6 +947,19 @@ sap.ui.define([
 				this._oPopover._oControl.addButton(this._createPopoverCloseButton());
 			}
 
+			if (this._getIconTabHeader()._isInsideToolHeader()) {
+				this._oPopover.addStyleClass("sapMITBFilterPopoverInToolHeader");
+				this._oPopover.setOffsetY(POPOVER_OFFSET_Y_TOOL_HEADER);
+
+				if (!Device.system.phone) {
+					this._oPopover.addEventDelegate({
+						onAfterRendering: function (oEvent) {
+							this._oPopover.getDomRef().style.minWidth = this.$().outerWidth(true) + "px";
+						}.bind(this)
+					});
+				}
+			}
+
 			this.addDependent(this._oPopover);
 
 			this._oPopover._oControl._adaptPositionParams = function () {
@@ -1347,5 +1376,12 @@ sap.ui.define([
 		}
 	};
 
+	IconTabFilter.prototype._shouldReadIconColor = function () {
+		var sIconColor = this.getIconColor();
+
+		return this.getEnabled() &&
+			(sIconColor === "Positive" || sIconColor === "Critical" || sIconColor === "Negative" || sIconColor === "Neutral");
+	};
+
 	return IconTabFilter;
 });

package/src/sap/m/IconTabFilterExpandButtonBadge.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/IconTabHeader.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -114,7 +114,6 @@ sap.ui.define([
 
 			/**
 			 * Specifies the header mode.
-			 * <b>Note:</b> The Inline mode works only if no icons are set.
 			 *
 			 * @since 1.40
 			 */
@@ -505,7 +504,7 @@ sap.ui.define([
 	 * Sets the selected item, updates the UI, and fires the select event.
 	 * @private
 	 * @param {sap.m.IconTabFilter} oItem The item to be selected
-	 * @param {Boolean} bAPIChange whether this function is called through the API
+	 * @param {boolean} bAPIChange whether this function is called through the API
 	 * @returns {this} this pointer for chaining
 	 */
 	IconTabHeader.prototype.setSelectedItem = function (oItem, bAPIChange) {
@@ -844,7 +843,7 @@ sap.ui.define([
 
 	/**
 	 * Sets whether the currently selected item is preserved.
-	 * @param {Boolean} bPreserveSelection The new value
+	 * @param {boolean} bPreserveSelection The new value
 	 * @private
 	 */
 	IconTabHeader.prototype._setPreserveSelection = function (bPreserveSelection) {
@@ -877,7 +876,7 @@ sap.ui.define([
 	 * @private
 	 */
 	IconTabHeader.prototype.isInlineMode = function () {
-		return this._bTextOnly && this.getMode() == IconTabHeaderMode.Inline;
+		return this.getMode() === IconTabHeaderMode.Inline;
 	};
 
 	/**
@@ -1053,6 +1052,7 @@ sap.ui.define([
 				aItems[i].classList.add("sapMITBFilterHidden");
 			}
 
+			oOverflow._updateTabCountText();
 			oOverflow._updateExpandButtonBadge();
 			return;
 		}
@@ -1073,6 +1073,7 @@ sap.ui.define([
 				aItems[i].classList.add("sapMITBFilterHidden");
 			}
 
+			oStartOverflow._updateTabCountText();
 			oStartOverflow._updateExpandButtonBadge();
 			return;
 		}
@@ -1102,6 +1103,8 @@ sap.ui.define([
 		}
 
 		oStartOverflow._updateExpandButtonBadge();
+		oStartOverflow._updateTabCountText();
+		oOverflow._updateTabCountText();
 		oOverflow._updateExpandButtonBadge();
 	};
 
@@ -1343,6 +1346,15 @@ sap.ui.define([
 		return oParent instanceof Control && oParent.isA('sap.m.IconTabBar');
 	};
 
+	/**
+	 * Returns if the control is inside a sap.tnt.ToolHeader.
+	 * @private
+	 */
+	IconTabHeader.prototype._isInsideToolHeader = function() {
+		var oParent = this.getParent();
+		return oParent instanceof Control && oParent.isA('sap.tnt.ToolHeader');
+	};
+
 	/**
 	 * Invalidates the parent if it is an IconTabBar
 	 * @private
@@ -1383,9 +1395,8 @@ sap.ui.define([
 		var aItems = this.getItems(),
 			sSelectedKey = this.getSelectedKey(),
 			i = 0,
-			oParent = this.getParent(),
 			bIsParentIconTabBar = this._isInsideIconTabBar(),
-			bIsParentToolHeader = oParent && oParent.isA("sap.tnt.ToolHeader");
+			bIsParentToolHeader = this._isInsideToolHeader();
 
 		if (!aItems.length) {
 			return;

package/src/sap/m/IconTabHeaderRenderer.js

@@ -63,6 +63,7 @@ sap.ui.define(['./library'],
 
 		if (bInLine) {
 			oRM.class("sapMITBInLine");
+			oRM.class("sapMITBTextOnly");
 		}
 
 		oRM.accessibilityState(oControl, {

package/src/sap/m/IconTabSeparator.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @implements sap.m.IconTab
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Image.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @public
 	 * @alias sap.m.Image
@@ -774,7 +774,7 @@ sap.ui.define([
 	 *
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @protected
-	 * @returns {Object} The <code>sap.m.Image</code> accessibility information
+	 * @returns {object} The <code>sap.m.Image</code> accessibility information
 	 */
 	Image.prototype.getAccessibilityInfo = function() {
 		var bHasPressListeners = this.hasListeners("press");

package/src/sap/m/ImageContent.js

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

package/src/sap/m/Input.js

@@ -159,7 +159,7 @@ function(
 	 *
 	 * @extends sap.m.InputBase
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -563,6 +563,11 @@ function(
 		if (this.getId().indexOf("popup-input") === -1) {
 			this._createSuggestionsPopover();
 		}
+
+		// We need to set this to empty string as we are comparing it with sValue in the before rendering
+		// phase of the life cycle. Without this line, initially the condition fails and fires liveChange event
+		// even though there is no user input (check Input.prototype.onsapright).
+		this._setTypedInValue("");
 	};
 
 	/**
@@ -647,8 +652,6 @@ function(
 			this.setProperty("width", "100%", true);
 		}
 
-		this._resetTypeAhead();
-
 		if (this._hasTabularSuggestions()) {
 			this._getSuggestionsTable().setAutoPopinMode(this.getEnableTableAutoPopinMode());
 			this._getSuggestionsTable().setContextualWidth(this.getEnableTableAutoPopinMode() ? "Auto" : "Inherit");
@@ -1316,13 +1319,23 @@ function(
 	Input.prototype.onsapenter = function(oEvent) {
 		var bPopupOpened = this._isSuggestionsPopoverOpen(),
 			bFocusInPopup = !this.hasStyleClass("sapMFocus") && bPopupOpened,
-			iValueLength;
+			aItems = this._hasTabularSuggestions() ? this.getSuggestionRows() : this.getSuggestionItems(),
+			iValueLength, oSelectedItem;
 
 		// when enter is pressed before the timeout of suggestion delay, suggest event is cancelled
 		this.cancelPendingSuggest();
 
 		bFocusInPopup && this.setSelectionUpdatedFromList(true);
 
+		if (this.getShowSuggestion() && this._bDoTypeAhead && bPopupOpened) {
+			oSelectedItem = this._getSuggestionsPopover().getItemsContainer().getSelectedItem();
+			if (this._hasTabularSuggestions()) {
+				oSelectedItem && this.setSelectionRow(oSelectedItem, true);
+			} else {
+				oSelectedItem && this.setSelectionItem(ListHelpers.getItemByListItem(aItems, oSelectedItem), true);
+			}
+		}
+
 		if (bPopupOpened && !this.isComposingCharacter()) {
 			this._closeSuggestionPopup();
 			iValueLength = this.getDOMValue() ? this.getDOMValue().length : null;
@@ -1761,7 +1774,7 @@ function(
 	/**
 	 * Opens the <code>SuggestionsPopover</code> and adjusts the corresponding acc
 	 *
-	 * @param {Boolean} bOpenCondition Additional open condition
+	 * @param {boolean} bOpenCondition Additional open condition
 	 * @private
 	 */
 	Input.prototype._openSuggestionPopup = function (bOpenCondition) {
@@ -1780,26 +1793,35 @@ function(
 	};
 
 	/**
-	 * Applies Suggestion Acc
+	 * Applies Suggestion Accessibility
+	 *
+	 * Adds the aria-desribedby text with the number of available suggestions.
 	 *
 	 * @param {Integer} iNumItems
 	 * @private
 	 */
-	Input.prototype._applySuggestionAcc = function (iNumItems) {
+	Input.prototype._applySuggestionAcc = function(iNumItems) {
 		var sAriaText = "",
 			oRb = this._oRb;
 
-		// add items to list
-		if (iNumItems === 1) {
-			sAriaText = oRb.getText("INPUT_SUGGESTIONS_ONE_HIT");
-		} else if (iNumItems > 1) {
-			sAriaText = oRb.getText("INPUT_SUGGESTIONS_MORE_HITS", iNumItems);
-		} else {
-			sAriaText = oRb.getText("INPUT_SUGGESTIONS_NO_HIT");
-		}
+		// Timeout is used because sometimes when we have suggestions
+		// that are fetched from the backend and filtered with a delay this function
+		// could be called twice - the first time with no available results.
+		// In that case the second DOM update of the invisible text element
+		// do not occur if it is synchronous. BCP #2070466087
+		setTimeout(function () {
+			// add items to list
+			if (iNumItems === 1) {
+				sAriaText = oRb.getText("INPUT_SUGGESTIONS_ONE_HIT");
+			} else if (iNumItems > 1) {
+				sAriaText = oRb.getText("INPUT_SUGGESTIONS_MORE_HITS", iNumItems);
+			} else {
+				sAriaText = oRb.getText("INPUT_SUGGESTIONS_NO_HIT");
+			}
 
-		// update Accessibility text for suggestion
-		this.$("SuggDescr").text(sAriaText);
+			// update Accessibility text for suggestion
+			this.$("SuggDescr").text(sAriaText);
+		}.bind(this), 0);
 	};
 
 	/**
@@ -2237,8 +2259,6 @@ function(
 			return this;
 		};
 
-		oSuggestionsTable.attachItemPress(this._resetTypeAhead, this);
-
 		oTableObserver = new ManagedObjectObserver(function (oChange) {
 			var sMutation = oChange.mutation;
 			var vItem = oChange.child;
@@ -2304,6 +2324,7 @@ function(
 		this._iSetCount++;
 		InputBase.prototype.setValue.call(this, sValue);
 		this._onValueUpdated(sValue);
+		this._setTypedInValue("");
 		return this;
 	};
 
@@ -2688,22 +2709,27 @@ function(
 		oSuggPopover.attachEvent(SuggestionsPopover.M_EVENTS.SELECTION_CHANGE, function (oEvent) {
 			var oItem = oEvent.getParameter("newItem"),
 				sNewValue = this.calculateNewValue(oItem),
-				bFocusedGroupHeader = oItem && oItem.isA("sap.m.GroupHeaderListItem"),
+				bIsGroupItem = oItem && oItem.isA("sap.m.GroupHeaderListItem"),
 				oFocusDomRef = this.getFocusDomRef(),
 				sTypedValue = oFocusDomRef && oFocusDomRef.value.substring(0, oFocusDomRef.selectionStart),
 				oPreviousItem = oEvent.getParameter("previousItem"),
 				bPreviosFocusOnGroup = oPreviousItem && oPreviousItem.isA("sap.m.GroupHeaderListItem"),
 				iSelectionStart = calculateSelectionStart(selectionRange(oFocusDomRef, bPreviosFocusOnGroup), sNewValue, sTypedValue, bPreviosFocusOnGroup);
 
-			// setValue isn't used because here is too early to modify the lastValue of input
-			this.setDOMValue(bFocusedGroupHeader ? sTypedValue : sNewValue);
+			if (!oItem) { // When out of the list, reset to user's input
+				this.setDOMValue(sTypedValue);
+			} else if (bIsGroupItem) { // If it's a GroupHeader item, reset the input
+				this.setDOMValue("");
+			} else { // Replace the value and highlight it
+				this.setDOMValue(sNewValue);
 
-			// memorize the value set by calling jQuery.val, because browser doesn't fire a change event when the value is set programmatically.
-			this._sSelectedSuggViaKeyboard = sNewValue;
-
-			if (!bFocusedGroupHeader) {
+				// If the matched item starts with user input's value, highlight only the remaining part. Otherwise, the whole item.
+				iSelectionStart = (iSelectionStart === 0 && sNewValue.indexOf(sTypedValue) === 0) ? sTypedValue.length : iSelectionStart;
 				this._doSelect(iSelectionStart);
 			}
+
+			// memorize the value set by calling jQuery.val, because browser doesn't fire a change event when the value is set programmatically.
+			this._sSelectedSuggViaKeyboard = sNewValue;
 		}, this);
 
 		if (this.getShowTableSuggestionValueHelp()) {
@@ -2810,6 +2836,7 @@ function(
 					}
 
 					this._deregisterPopupResize();
+					this.addStyleClass("sapMFocus");
 				}, this)
 				.attachBeforeOpen(function () {
 					oSuggPopover._sPopoverContentWidth = this.getMaxSuggestionWidth();
@@ -2910,7 +2937,7 @@ function(
 	/**
 	 * Indicates whether the control should use <code>sap.m.Dialog</code> or not.
 	 *
-	 * @returns {Boolean} Boolean.
+	 * @returns {boolean} Boolean.
 	 * @protected
 	 */
 	Input.prototype.isMobileDevice = function () {
@@ -2976,7 +3003,7 @@ function(
 	 *
 	 * @protected
 	 * @param {HTMLElement|undefined} oTarget The target of the event.
-	 * @returns {Boolean} Boolean indicating if the target is a valid opener.
+	 * @returns {boolean} Boolean indicating if the target is a valid opener.
 	 */
 	Input.prototype.isValueHelpOnlyOpener = function (oTarget) {
 		return true;

package/src/sap/m/InputBase.js

@@ -62,7 +62,7 @@ function(
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.91.0
+	 * @version 1.93.2
 	 *
 	 * @constructor
 	 * @public
@@ -548,8 +548,8 @@ function(
 	 * Fires the change event for the listeners
 	 *
 	 * @protected
-	 * @param {String} sValue value of the input.
-	 * @param {Object} [oParams] extra event parameters.
+	 * @param {string} sValue value of the input.
+	 * @param {object} [oParams] extra event parameters.
 	 * @since 1.22.1
 	 */
 	InputBase.prototype.fireChangeEvent = function(sValue, oParams) {
@@ -570,7 +570,7 @@ function(
 	 * It may require to re-implement this method from sub classes for control specific behaviour.
 	 *
 	 * @protected
-	 * @param {String} sValue Reverted value of the input.
+	 * @param {string} sValue Reverted value of the input.
 	 * @since 1.26
 	 */
 	InputBase.prototype.onValueRevertedByEscape = function(sValue, sPreviousValue) {
@@ -1016,12 +1016,14 @@ function(
 		var oEndIcon = this.getAggregation("_endIcon") || [],
 			oBeginIcon = this.getAggregation("_beginIcon") || [],
 			aIcons = oEndIcon.concat(oBeginIcon),
+			iIconMargin,
 			iIconWidth;
 
 		return aIcons.reduce(function(iAcc, oIcon){
+			iIconMargin = oIcon && oIcon.getDomRef() ? parseFloat(window.getComputedStyle(oIcon.getDomRef()).marginRight) : 0;
 			iIconWidth = oIcon && oIcon.getDomRef() ? oIcon.getDomRef().offsetWidth : 0;
 
-			return iAcc + iIconWidth;
+			return iAcc + iIconWidth + iIconMargin;
 		}, 0);
 	};
 
@@ -1070,7 +1072,7 @@ function(
 
 	/**
 	 * @see sap.ui.core.Control#getAccessibilityInfo
-	 * @returns {Object} The accessibility information for this <code>InputBase</code>
+	 * @returns {object} The accessibility information for this <code>InputBase</code>
 	 * @protected
 	 */
 	InputBase.prototype.getAccessibilityInfo = function() {