@openui5/sap.m 1.109.0 → 1.111.0

package/src/sap/m/IllustratedMessage.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -58,8 +58,8 @@ sap.ui.define([
 	 * An <code>IllustratedMessage</code> is a recommended combination of a solution-oriented message,
 	 * an engaging illustration, and conversational tone to better communicate an empty or a success state
 	 * than just show a message alone.
-	 * Empty states are moments in the user experience where there’s no data to display.
-	 * Success states are occasions to celebrate and reward a user’s special accomplishment or the completion of an important task.
+	 * Empty states are moments in the user experience where there's no data to display.
+	 * Success states are occasions to celebrate and reward a user's special accomplishment or the completion of an important task.
 	 *
 	 * The <code>IllustratedMessage</code> control is meant to be used inside container controls,
 	 * for example a <code>Card</code>, a <code>Dialog</code>, or a <code>Page</code>.
@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -99,7 +99,7 @@ sap.ui.define([
 				/**
 				 * Defines the description displayed below the title.
 				 *
-				 * If there is no initial input from the app developer and the default illustration set is being used,
+				 * If there is no initial input from the app developer, <code>enableDefaultTitleAndDescription</code> is <code>true</code> and the default illustration set is being used,
 				 * a default description for the current illustration type is going to be displayed. The default
 				 * description is stored in the <code>sap.m</code> resource bundle.
 				 *
@@ -107,6 +107,14 @@ sap.ui.define([
 				 */
 				description : {type : "string", group : "Misc", defaultValue : ""},
 
+				/**
+				 * Defines whether the default title and description should be used when the input for their respective part is empty
+				 * and the default illustration set is being used. Title and description are stored in the <code>sap.m</code> resource bundle.
+				 *
+				 * @since 1.111
+				 */
+				enableDefaultTitleAndDescription: { type: "boolean", group: "Appearance", defaultValue: true },
+
 				/**
 				 * Defines whether the value set in the <code>description</code> property is displayed
 				 * as formatted text in HTML format.
@@ -154,8 +162,9 @@ sap.ui.define([
 				/**
 				 * Defines the title that is displayed below the illustration.
 				 *
-				 * If there is no initial input from the app developer and the default illustration set is being used,
-				 * a default title is displayed corresponding to the current <code>illustrationType</code>.
+				 * If there is no initial input from the app developer, <code>enableDefaultTitleAndDescription</code> is <code>true</code> and the default illustration set is being used,
+				 * a default title is displayed corresponding to the current <code>illustrationType</code>. The default
+				 * title is stored in the <code>sap.m</code> resource bundle.
 				 *
 				 * @since 1.98
 				 */
@@ -233,7 +242,10 @@ sap.ui.define([
 		SuccessScreen: "SuccessScreen",
 		NoMail: "NoMail",
 		NoSavedItems: "NoSavedItems",
-		NoTasks: "NoTasks"
+		NoTasks: "NoTasks",
+		UploadToCloud: "UploadToCloud",
+		NoDimensionsSet: "NoDimensionsSet",
+		AddDimensions: "AddDimensions"
 	};
 
 	IllustratedMessage.FALLBACK_TEXTS = {
@@ -371,6 +383,32 @@ sap.ui.define([
 			oBundle.getText(sPrepend + IllustratedMessage.FALLBACK_TEXTS[this._sIllustrationType], null, true);
 	};
 
+	/**
+	 * Helper method which decides if the title should be rendered.
+	 * When it's empty it shouldn't take space in the DOM.
+	 * @private
+	 * @returns {boolean} whether or not the title should be rendered
+	 */
+	IllustratedMessage.prototype._shouldRenderTitle = function () {
+		return this._getTitle().getText().length !== 0;
+	};
+
+	/**
+	 * Helper method which decides if the description should be rendered.
+	 * When it's empty it shouldn't take space in the DOM.
+	 * @private
+	 * @returns {boolean} whether or not the description should be rendered
+	 */
+	IllustratedMessage.prototype._shouldRenderDescription = function () {
+		var oDescription = this._getDescription();
+
+		if (this.getEnableFormattedText()) {
+			return oDescription.getHtmlText().length !== 0;
+		} else {
+			return oDescription.getText().length !== 0;
+		}
+	};
+
 	/**
 	 * Gets the correct aggregation for the description.
 	 * If the enableFormattedText property is true, the function returns
@@ -383,9 +421,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * Gets content of the _formattedText aggregation.
+	 * Gets content of the formattedText aggregation.
 	 * @private
-	 * @returns {sap.m.FormattedText}
+	 * @returns {sap.m.FormattedText} The sap.m.FormattedText control instance
 	 */
 	IllustratedMessage.prototype._getFormattedText = function () {
 		var sDescription = this.getDescription(),
@@ -396,20 +434,20 @@ sap.ui.define([
 			this.setAggregation("_formattedText", oFormattedText);
 		}
 
-		if (sDescription) {
-			oFormattedText.setHtmlText(sDescription);
-		} else {
+		if (!sDescription && this.getEnableDefaultTitleAndDescription()) {
 			// Use default text for the description if applicable
 			oFormattedText.setHtmlText(this._getDefaultDescription());
+		} else {
+			oFormattedText.setHtmlText(sDescription);
 		}
 
 		return oFormattedText;
 	};
 
 	/**
-	 * Gets content of the _illustration aggregation.
+	 * Gets content of the illustration aggregation.
 	 * @private
-	 * @returns {sap.m.Illustration}
+	 * @returns {sap.m.Illustration} The sap.m.Illustration control instance
 	 */
 	IllustratedMessage.prototype._getIllustration = function () {
 		var oIllustration = this.getAggregation("_illustration");
@@ -430,7 +468,7 @@ sap.ui.define([
 	/**
 	 * Gets content of the _text aggregation.
 	 * @private
-	 * @returns {sap.m.Text}
+	 * @returns {sap.m.Text} The sap.m.Text control instance
 	 */
 	IllustratedMessage.prototype._getText = function () {
 		var sDescription = this.getDescription(),
@@ -441,11 +479,11 @@ sap.ui.define([
 			this.setAggregation("_text", oText);
 		}
 
-		if (sDescription) {
-			oText.setText(sDescription);
-		} else {
+		if (!sDescription && this.getEnableDefaultTitleAndDescription()) {
 			// Use default text for the description if applicable
 			oText.setText(this._getDefaultDescription());
+		} else {
+			oText.setText(sDescription);
 		}
 
 		return oText;
@@ -454,7 +492,7 @@ sap.ui.define([
 	/**
 	 * Gets content of the _title aggregation.
 	 * @private
-	 * @returns {sap.m.Title}
+	 * @returns {sap.m.Title} The sap.m.Title control instance
 	 */
 	IllustratedMessage.prototype._getTitle = function () {
 		var sTitle = this.getTitle(),
@@ -465,11 +503,11 @@ sap.ui.define([
 			this.setAggregation("_title", oTitle);
 		}
 
-		if (sTitle) {
-			oTitle.setText(sTitle);
-		} else {
+		if (!sTitle && this.getEnableDefaultTitleAndDescription()) {
 			// Use default text for the title if applicable
 			oTitle.setText(this._getDefaultTitle());
+		} else {
+			oTitle.setText(sTitle);
 		}
 
 		return oTitle;
@@ -524,6 +562,7 @@ sap.ui.define([
 
 	/**
 	 * Caches the <code>IllustratedMessage</code> illustration set and illustration type in private instance variables.
+	 * @param {string} sValue The Set-Type pair which should be stored
 	 * @private
 	 */
 	IllustratedMessage.prototype._updateInternalIllustrationSetAndType = function (sValue) {
@@ -535,7 +574,7 @@ sap.ui.define([
 
 	/**
 	 * Handles the resize event of the <code>IllustratedMessage</code>.
-	 * @param {jQuery.Event} oEvent
+	 * @param {jQuery.Event} oEvent The event object
 	 * @private
 	 */
 	IllustratedMessage.prototype._onResize = function (oEvent) {
@@ -577,7 +616,7 @@ sap.ui.define([
 
 	/**
 	 * It puts the appropriate classes on the control based on the current media size.
-	 * @param {string} sCurrentMedia
+	 * @param {string} sCurrentMedia The media currently being used
 	 * @private
 	 */
 	IllustratedMessage.prototype._updateMediaStyle = function (sCurrentMedia) {
@@ -683,8 +722,8 @@ sap.ui.define([
 	/**
 	 * Registers resize handler.
 	 * @param {string} sHandler the handler ID
-	 * @param {Object} oObject
-	 * @param {Function} fnHandler
+	 * @param {Object} oObject object on which the resize handler is being registered
+	 * @param {Function} fnHandler the callback function for each resize
 	 * @private
 	 */
 	IllustratedMessage.prototype._registerResizeHandler = function (sHandler, oObject, fnHandler) {

package/src/sap/m/IllustratedMessageRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -26,7 +26,9 @@ sap.ui.define([], function () {
 			sIllustratedMessageTitle = oIllustratedMessage._getTitle(),
 			sIllustratedMessageDescription = oIllustratedMessage._getDescription(),
 			aIllustratedMessageAdditionalContent = oIllustratedMessage.getAdditionalContent(),
-			bIllustratedMessageEnableVerticalResponsiveness = oIllustratedMessage.getEnableVerticalResponsiveness();
+			bIllustratedMessageEnableVerticalResponsiveness = oIllustratedMessage.getEnableVerticalResponsiveness(),
+			bRenderTitle = oIllustratedMessage._shouldRenderTitle(),
+			bRenderDescription = oIllustratedMessage._shouldRenderDescription();
 
 		// IllustratedMessage's Root DOM Element.
 		oRm.openStart("figure", oIllustratedMessage);
@@ -42,10 +44,16 @@ sap.ui.define([], function () {
 
 			oRm.renderControl(oIllustratedMessageIllustration);
 
-			oRm.openStart("figcaption").openEnd();
-				oRm.renderControl(sIllustratedMessageTitle);
-				oRm.renderControl(sIllustratedMessageDescription.addStyleClass("sapMIllustratedMessageDescription"));
-			oRm.close("figcaption");
+			if (bRenderTitle || bRenderDescription) {
+				oRm.openStart("figcaption").openEnd();
+					if (bRenderTitle) {
+						oRm.renderControl(sIllustratedMessageTitle);
+					}
+					if (bRenderDescription) {
+						oRm.renderControl(sIllustratedMessageDescription.addStyleClass("sapMIllustratedMessageDescription"));
+					}
+				oRm.close("figcaption");
+			}
 
 			oRm.close("div"); // main content container end
 

package/src/sap/m/IllustratedMessageSize.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/IllustratedMessageType.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/Illustration.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/IllustrationPool.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

package/src/sap/m/IllustrationRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/Image.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @public
 	 * @alias sap.m.Image
@@ -847,7 +847,8 @@ sap.ui.define([
 	 *
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @protected
-	 * @returns {object} The <code>sap.m.Image</code> accessibility information
+	 * @returns {sap.ui.core.AccessibilityInfo}
+	 * The object contains the accessibility information for <code>sap.m.Image</code>
 	 */
 	Image.prototype.getAccessibilityInfo = function() {
 		var bHasPressListeners = this.hasListeners("press");

package/src/sap/m/ImageContent.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @since 1.38
 	 *
 	 * @public

package/src/sap/m/ImageContentRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/ImageRenderer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/m/Input.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -157,7 +157,7 @@ function(
 	 * @extends sap.m.InputBase
 	 * @implements sap.ui.core.IAccessKeySupport
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @constructor
 	 * @public
@@ -167,7 +167,8 @@ function(
 	var Input = InputBase.extend("sap.m.Input", /** @lends sap.m.Input.prototype */ {
 		metadata : {
 			interfaces : [
-				"sap.ui.core.IAccessKeySupport"
+				"sap.ui.core.IAccessKeySupport",
+				"sap.m.IToolbarInteractiveControl"
 			],
 			library : "sap.m",
 			properties : {
@@ -849,7 +850,7 @@ function(
 		}
 
 		this._sSelectedValue = sNewValue;
-
+		this.setSelectionUpdatedFromList(false);
 		this.updateInputField(sNewValue);
 
 		// don't continue if the input is destroyed after firing change event through updateInputField
@@ -1065,7 +1066,7 @@ function(
 		}
 
 		this._sSelectedValue = sNewValue;
-
+		this.setSelectionUpdatedFromList(false);
 		this.updateInputField(sNewValue);
 
 		// don't continue if the input is destroyed after firing change event through updateInputField
@@ -1074,11 +1075,11 @@ function(
 		}
 
 		if (!(this.isMobileDevice() && this.isA("sap.m.MultiInput") && this._isMultiLineMode)) {
-			this.setSelectionUpdatedFromList(false);
 			this._closeSuggestionPopup();
 		}
 
 		this._bSelectingItem = false;
+		this._resetTypeAhead();
 	};
 
 	/**
@@ -1273,7 +1274,7 @@ function(
 	 * Sets a custom filter function for suggestions. The default is to check whether the first item text begins with the typed value. For one and two-value suggestions this callback function will operate on sap.ui.core.Item types, for tabular suggestions the function will operate on sap.m.ColumnListItem types.
 	 *
 	 * @public
-	 * @param {function} fnFilter The filter function is called when displaying suggestion items and has two input parameters: the first one is the string that is currently typed in the input field and the second one is the item that is being filtered. Returning true will add this item to the popup, returning false will not display it.
+	 * @param {function(string=, sap.ui.core.Item=, boolean=):boolean|undefined|function} fnFilter The filter function is called when displaying suggestion items and has two input parameters: the first one is the string that is currently typed in the input field and the second one is the item that is being filtered. Returning true will add this item to the popup, returning false will not display it.
 	 * @returns {this} this pointer for chaining
 	 * @since 1.16.1
 	 */
@@ -1311,7 +1312,7 @@ function(
 	 * Sets a custom result filter function for tabular suggestions to select the text that is passed to the input field. Default is to check whether the first cell with a "text" property begins with the typed value. For one value and two-value suggestions this callback function is not called.
 	 *
 	 * @public
-	 * @param {function} fnFilter The result function is called with one parameter: the sap.m.ColumnListItem that is selected. The function must return a result string that will be displayed as the input field's value.
+	 * @param {function(string=, sap.ui.core.Item=, boolean=):boolean|undefined|function} fnFilter The result function is called with one parameter: the sap.m.ColumnListItem that is selected. The function must return a result string that will be displayed as the input field's value.
 	 * @returns {this} this pointer for chaining
 	 * @since 1.21.1
 	 */
@@ -1408,11 +1409,9 @@ function(
 		if (this._isSuggestionsPopoverOpen()) {
 			// mark the event as already handled
 			oEvent.originalEvent._sapui_handledByControl = true;
-			this._setProposedItemText(null);
-			this.setSelectionUpdatedFromList(false);
-			this._closeSuggestionPopup();
+			this._revertPopupSelection();
 
-			// restore the initial value that was there before suggestion dialog
+			// revert autocompleted value on desktop
 			if (this._getTypedInValue() !== this.getValue()) {
 				this.setValue(this._getTypedInValue());
 			}
@@ -1513,7 +1512,7 @@ function(
 
 		this.bValueHelpRequested = false;
 
-		if (!this._getProposedItemText() && this.isMobileDevice()) {
+		if (!this._getProposedItemText() || this.isMobileDevice()) {
 			return;
 		}
 
@@ -1956,6 +1955,10 @@ function(
 		// In that case the second DOM update of the invisible text element
 		// do not occur if it is synchronous. BCP #2070466087
 		setTimeout(function () {
+			if (!this.getSuggestionItems().length && !this._hasTabularSuggestions()) {
+				return this.$("SuggDescr").text("");
+			}
+
 			// add items to list
 			if (iNumItems === 1) {
 				sAriaText = oRb.getText("INPUT_SUGGESTIONS_ONE_HIT");
@@ -2201,6 +2204,8 @@ function(
 			value: "",
 			selectedItem: null
 		};
+		var oListDelegate;
+		var oList = oInput._getSuggestionsPopover() && oInput._getSuggestionsPopover().getItemsContainer();
 
 		// check if typeahead is already performed
 		if ((oInput && oInput.getValue().toLowerCase()) === (this._getProposedItemText() && this._getProposedItemText().toLowerCase())) {
@@ -2225,6 +2230,26 @@ function(
 				return bHasTabularSuggestions ? oInput._getRowResultFunction()(oItem) : oItem.getText();
 			};
 
+		// If there are no items yet - perform the type-ahead on a later stage.
+		// Attach a listener to the list for when they are available, in case they are being dynamically loaded.
+		if (this.isMobileDevice() && oList && !aItems.length) {
+			oListDelegate = {
+				onBeforeRendering: function() {
+					if (oList.getItems().length) {
+						this._handleTypeAhead(oInput);
+					}
+				},
+				onAfterRendering: function() {
+					if (oList.getItems().length) {
+						oList.removeDelegate(oListDelegate);
+					}
+				}
+			};
+			oList.addDelegate(oListDelegate, this);
+
+			return;
+		}
+
 		var aItemsToSelect = typeAhead(sValue, this, aItems, function (oItem) {
 			return this._formatTypedAheadValue(fnExtractText(oItem));
 		}.bind(this));
@@ -2543,7 +2568,7 @@ function(
 	 *
 	 * @see sap.ui.core.Control#getAccessibilityInfo
 	 * @protected
-	 * @returns {object} Accessibility information.
+	 * @returns {sap.ui.core.AccessibilityInfo} Accessibility information.
 	 */
 	Input.prototype.getAccessibilityInfo = function() {
 		var oInfo = InputBase.prototype.getAccessibilityInfo.apply(this, arguments);
@@ -2748,7 +2773,7 @@ function(
 					return;
 				}
 
-				aListItemsDomRef = oList.$().find('.sapMSLIInfo, .sapMSLITitleOnly');
+				aListItemsDomRef = oList.$().find('.sapMSLIInfo [id$=-infoText], .sapMSLITitleOnly [id$=-titleText]');
 				sInputValue = this._bDoTypeAhead ? this._getTypedInValue() : this.getValue();
 				sInputValue = (sInputValue || "").toLowerCase();
 
@@ -2839,7 +2864,23 @@ function(
 
 	Input.prototype.forwardEventHandlersToSuggPopover = function (oSuggPopover) {
 		oSuggPopover.setOkPressHandler(this._closeSuggestionPopup.bind(this));
-		oSuggPopover.setCancelPressHandler(this._closeSuggestionPopup.bind(this));
+		oSuggPopover.setCancelPressHandler(this._revertPopupSelection.bind(this));
+	};
+
+
+	Input.prototype._revertPopupSelection = function () {
+		var oSuggestionPopover = this._getSuggestionsPopover(),
+			oPopupInput = oSuggestionPopover && oSuggestionPopover.getInput();
+
+		this._setProposedItemText(null);
+		this.setSelectionUpdatedFromList(false);
+
+		// revert the typed in value on mobile to prevent change on close
+		if (this.isMobileDevice()) {
+			oPopupInput && oPopupInput.setDOMValue(this.getLastValue());
+		}
+
+		this._closeSuggestionPopup();
 	};
 
 	/**
@@ -2971,12 +3012,22 @@ function(
 						return;
 					}
 
+					var oSelectedItem = oList && oList.getSelectedItem();
+
+					if (this._getProposedItemText() && oSelectedItem) {
+						this.setSelectionUpdatedFromList(true);
+					}
+
+					if (this.getSelectionUpdatedFromList()) {
+						this.updateSelectionFromList(oSelectedItem);
+					}
+
 					if (Table && !(oList instanceof Table)) {
 						oList.destroyItems();
 					} else {
 						oList.removeSelections(true);
 					}
-				})
+				}, this)
 				.attachAfterOpen(function () {
 					this._triggerSuggest(this.getValue());
 					this._refreshListItems();
@@ -2996,7 +3047,7 @@ function(
 		} else {
 			oPopover
 				.attachAfterClose(function() {
-					var oList = this._getSuggestionsPopover().getItemsContainer();
+					var oList = oSuggPopover.getItemsContainer();
 					var oSelectedItem = oList && oList.getSelectedItem();
 					var oDomRef = this.getDomRef();
 
@@ -3067,7 +3118,7 @@ function(
 	 * Opens the <code>SuggestionsPopover</code> with the available items.
 	 * <b>Note:</b> When <code>valueHelpOnly</code> property is set to true, the <code>SuggestionsPopover</code> will not open.
 	 *
-	 * @param {function} fnFilter Function to filter the items shown in the SuggestionsPopover
+	 * @param {function|undefined} fnFilter Function to filter the items shown in the SuggestionsPopover
 	 * @returns {void}
 	 *
 	 * @since 1.64
@@ -3403,6 +3454,20 @@ 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;
+	};
+
+
 	return Input;
 
 });