@openui5/sap.m 1.99.0 → 1.100.0

package/THIRDPARTY.txt

@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.7
+Component: URI.js, version: 1.19.10
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.36-SNAPSHOT
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.m",
-  "version": "1.99.0",
+  "version": "1.100.0",
   "description": "OpenUI5 UI Library sap.m",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,8 +14,8 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.99.0",
-    "@openui5/sap.ui.layout": "1.99.0",
-    "@openui5/sap.ui.unified": "1.99.0"
+    "@openui5/sap.ui.core": "1.100.0",
+    "@openui5/sap.ui.layout": "1.100.0",
+    "@openui5/sap.ui.unified": "1.100.0"
   }
 }

package/src/sap/m/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.99.0</version>
+  <version>1.100.0</version>
 
   <documentation>The main UI5 control library, with responsive controls that can be used in touch devices as well as desktop browsers.</documentation>
 

package/src/sap/m/AccButton.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Button','./AccButtonRenderer'],
 	 * @extends sap.m.Button
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/ActionListItem.js

@@ -31,7 +31,7 @@ sap.ui.define(['./ListItemBase', './library', './ActionListItemRenderer'],
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ActionListItemRenderer.js

@@ -17,15 +17,13 @@ sap.ui.define(["./ListItemBaseRenderer", "sap/ui/core/Renderer"],
 	ActionListItemRenderer.apiVersion = 2;
 
 	/**
-	 * Renders the HTML for the given control, using the provided
+	 * Renders the List item attributes for the given control, using the provided
 	 * {@link sap.ui.core.RenderManager}.
 	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *          oRenderManager the RenderManager that can be used for writing to the
-	 *          Render-Output-Buffer
-	 * @param {sap.m.ActionListItem}
-	 *          oControl an object representation of the control that should be
-	 *          rendered
+	 * @param {sap.ui.core.RenderManager} rm
+	 *          RenderManager to be used for rendering
+	 * @param {sap.m.ActionListItem} oLI
+	 *          The item for which the attributes should be rendered
 	 */
 	ActionListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMALI");

package/src/sap/m/ActionSelect.js

@@ -20,7 +20,7 @@ sap.ui.define(['./Select', 'sap/ui/core/InvisibleText', 'sap/ui/Device', 'sap/ui
 		 * @extends sap.m.Select
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ActionSheet.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -437,7 +437,7 @@ sap.ui.define([
 		if (!this._oCancelButton) {
 			var sCancelButtonText = (this.getCancelButtonText()) ? this.getCancelButtonText() : sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACTIONSHEET_CANCELBUTTON_TEXT"),
 				that = this;
-	//			var sButtonStyle = (sap.ui.Device.os.ios) ? sap.m.ButtonType.Unstyled : sap.m.ButtonType.Default;
+	//			var sButtonStyle = (Device.os.ios) ? ButtonType.Unstyled : ButtonType.Default;
 			this._oCancelButton = new Button(this.getId() + '-cancelBtn', {
 				text: sCancelButtonText,
 				type: ButtonType.Reject,

package/src/sap/m/App.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.m.NavContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/AssociativeOverflowToolbar.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/base/Log', './OverflowToolbar', './OverflowToolbarRenderer',
 		 * @extends sap.m.OverflowToolbar
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/Avatar.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/BadgeEnabler.js

@@ -8,9 +8,10 @@
 sap.ui.define([
 		'sap/m/BadgeCustomData',
 		'sap/base/Log',
-		'sap/m/library'
+		'sap/m/library',
+		'sap/ui/thirdparty/jquery'
 	],
-	function(BadgeCustomData, Log, library) {
+	function(BadgeCustomData, Log, library, jQuery) {
 		"use strict";
 
 		var IBADGE_CSS_CLASS = "sapMBadge";

package/src/sap/m/Bar.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @implements sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Breadcrumbs.js

@@ -42,7 +42,10 @@ sap.ui.define([
 	var SelectType = library.SelectType,
 
 		// shortcut for sap.m.BreadCrumbsSeparatorStyle
-		SeparatorStyle = library.BreadcrumbsSeparatorStyle;
+		SeparatorStyle = library.BreadcrumbsSeparatorStyle,
+
+		// shortcut for texts resource bundle
+		oResource = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
 	 * Constructor for a new <code>Breadcrumbs</code>.
@@ -60,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -135,10 +138,15 @@ sap.ui.define([
 		DoubleGreaterThan: ">>"
 	};
 
+	Breadcrumbs._getResourceBundleText = function (sText, vOptions) {
+		return oResource.getText(sText, vOptions);
+	};
+
 	/*************************************** Framework lifecycle events ******************************************/
 
 	Breadcrumbs.prototype.init = function () {
 		this._sSeparatorSymbol = Breadcrumbs.STYLE_MAPPER[this.getSeparatorStyle()];
+		this._aCachedInvisibleTexts = [];
 		this._getInvisibleText();
 	};
 
@@ -153,6 +161,9 @@ sap.ui.define([
 		if (this._bControlsInfoCached) {
 			this._updateSelect(true);
 		}
+
+		this._destroyInvisibleTexts();
+		this._aCachedInvisibleTexts = this._buildInvisibleTexts();
 	};
 
 	Breadcrumbs.prototype.onAfterRendering = function () {
@@ -177,6 +188,7 @@ sap.ui.define([
 	Breadcrumbs.prototype.exit = function () {
 		this._resetControl();
 		this._destroyItemNavigation();
+		this._destroyInvisibleTexts();
 
 		if (this._oInvisibleText) {
 			this._oInvisibleText.destroy();
@@ -196,7 +208,7 @@ sap.ui.define([
 
 
 	Breadcrumbs.prototype._getInvisibleText = function() {
-		var oAriaLabelText = BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_LABEL");
+		var oAriaLabelText = Breadcrumbs._getResourceBundleText("BREADCRUMB_LABEL");
 
 		if (!this._oInvisibleText) {
 			this._oInvisibleText = new InvisibleText({ id: this.getId() + "-InvisibleText"});
@@ -215,7 +227,7 @@ sap.ui.define([
 				autoAdjustWidth: true,
 				icon: IconPool.getIconURI("slim-arrow-down"),
 				type: SelectType.IconOnly,
-				tooltip: BreadcrumbsRenderer._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
+				tooltip: Breadcrumbs._getResourceBundleText("BREADCRUMB_SELECT_TOOLTIP")
 			})), true);
 		}
 		return this.getAggregation("_select");
@@ -231,10 +243,8 @@ sap.ui.define([
 
 			oCurrentLocation.addEventDelegate({
 				onAfterRendering: function () {
-					oCurrentLocation.$().attr("aria-current", "page");
-					oCurrentLocation.$().attr("tabindex", 0);
-					oCurrentLocation.$().attr("role", "link");
-				}
+					this._setCurrentLocationAccInfo(oCurrentLocation);
+				}.bind(this)
 			});
 
 			this.setAggregation("_currentLocation", oCurrentLocation).addStyleClass("sapMBreadcrumbsCurrentLocation");
@@ -242,6 +252,16 @@ sap.ui.define([
 		return this.getAggregation("_currentLocation");
 	};
 
+	Breadcrumbs.prototype._setCurrentLocationAccInfo = function (oCurrentLocation) {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(),
+			positionText = Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [aVisibleItems.length, aVisibleItems.length]);
+
+		oCurrentLocation.$().attr("aria-current", "page");
+		oCurrentLocation.$().attr("tabindex", 0);
+		oCurrentLocation.$().attr("role", "link");
+		oCurrentLocation.$().attr("aria-label", this.getCurrentLocationText() + " " + positionText);
+	};
+
 	function fnConvertArguments(sAggregationName, aArguments) {
 		var aConvertedArguments = Array.prototype.slice.apply(aArguments);
 		aConvertedArguments.unshift(sAggregationName);
@@ -285,6 +305,22 @@ sap.ui.define([
 		return vResult;
 	};
 
+	Breadcrumbs.prototype._destroyInvisibleTexts = function () {
+		var oControl;
+		this._aCachedInvisibleTexts.forEach(function (oData) {
+			oControl = sap.ui.getCore().byId(oData.controlId);
+
+			// remove reference to the invisible text on the sap.m.Link control
+			// check for control existence as it might have been destroyed already
+			if (oControl && oControl.removeAriaLabelledBy) {
+				oControl.removeAriaLabelledBy(oData.invisibleText.getId());
+			}
+
+			oData.invisibleText.destroy();
+		});
+		this._aCachedInvisibleTexts = [];
+	};
+
 	/*************************************** Select Handling ******************************************/
 
 	Breadcrumbs.prototype._decorateSelect = function (oSelect) {
@@ -448,6 +484,43 @@ sap.ui.define([
 		};
 	};
 
+	/**
+	 * Creates InvisibleText instances for the Link controls in the Breadcrumbs.
+	 * Used to add the position and the size of the controls to their ariaLabelledBy association.
+	 * An array of objects is returned for the instances to be destroyed on next invalidation with the following properties:
+	 * - controlId: the id of the Link to later remove the InvisibleText instance id from the ariaLabelledBy association
+	 * - invisibleText: the InvisibleText control itself to be destroyed
+	 */
+	Breadcrumbs.prototype._buildInvisibleTexts = function() {
+		var aVisibleItems = this._getControlsForBreadcrumbTrail(), // all visible links outside the drop-down, including current location
+			iItemCount = aVisibleItems.length,
+			oInvisibleText,
+			oInvisibleTexts = [];
+
+		aVisibleItems.forEach(function(oItem, iIndex) {
+			if (!oItem.isA("sap.m.Link")) {
+				// only links are relevant for the ariaLabelledBy association
+				return;
+			}
+
+			oInvisibleText = new InvisibleText({
+				text: Breadcrumbs._getResourceBundleText("BREADCRUMB_ITEM_POS", [iIndex + 1, iItemCount])
+			}).toStatic();
+
+			if (oItem.getAriaLabelledBy().indexOf(oItem.getId()) === -1) {
+				oItem.addAriaLabelledBy(oItem.getId());
+			}
+
+			oItem.addAriaLabelledBy(oInvisibleText.getId());
+			oInvisibleTexts.push({
+				controlId: oItem.getId(),
+				invisibleText: oInvisibleText
+			});
+		});
+
+		return oInvisibleTexts;
+	};
+
 	Breadcrumbs.prototype._getControlDistribution = function (iMaxContentSize) {
 		iMaxContentSize = iMaxContentSize || this._iContainerSize;
 		this._iContainerSize = iMaxContentSize;

package/src/sap/m/BreadcrumbsRenderer.js

@@ -16,7 +16,6 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 		apiVersion: 2
 	};
 
-	var oResource = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 	/**
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
@@ -51,18 +50,23 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 			this._renderControlInListItem(oRm, oSelect, sSeparator, false, "sapMBreadcrumbsSelectItem");
 		}
 
-		aControls.forEach(function (oChildControl) {
-			this._renderControlInListItem(oRm, oChildControl, sSeparator, oChildControl instanceof Text);
+		aControls.forEach(function (oChildControl, iIndex) {
+			this._renderControlInListItem(oRm, oChildControl, sSeparator, oChildControl instanceof Text, undefined, iIndex, aControls.length);
 		}, this);
 
 		oRm.close("ol");
 		oRm.close("nav");
 	};
 
-	BreadcrumbsRenderer._renderControlInListItem = function (oRm, oControl, sSeparator, bSkipSeparator, sAdditionalItemClass) {
+	BreadcrumbsRenderer._renderControlInListItem = function (oRm, oControl, sSeparator, bSkipSeparator, sAdditionalItemClass, iIndex, iVisibleItemsCount) {
 		oRm.openStart("li");
 		oRm.class("sapMBreadcrumbsItem");
 		oRm.class(sAdditionalItemClass);
+		if (iVisibleItemsCount && iIndex >= 0) {
+			// override the default size of the list to include the links count only
+			oRm.attr("aria-posinset", iIndex + 1);
+			oRm.attr("aria-setsize", iVisibleItemsCount);
+		}
 		oRm.openEnd();
 		oRm.renderControl(oControl);
 		if (!bSkipSeparator) {
@@ -71,9 +75,6 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 		oRm.close("li");
 	};
 
-	BreadcrumbsRenderer._getResourceBundleText = function (sText) {
-		return oResource.getText(sText);
-	};
 
 	return BreadcrumbsRenderer;
 

package/src/sap/m/BusyDialog.js

@@ -62,7 +62,7 @@ sap.ui.define(['./library',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @public
 		 * @alias sap.m.BusyDialog

package/src/sap/m/BusyIndicator.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Button.js

@@ -89,7 +89,7 @@ sap.ui.define([
 	 * @mixes sap.ui.core.ContextMenuSupport
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public
@@ -760,7 +760,7 @@ sap.ui.define([
 				activeSrc : sActiveSrc,
 				densityAware : bIconDensityAware,
 
-				// do not use default tootip in icon as the button renders it's own tooltip
+				// do not use default tooltip in icon as the button renders it's own tooltip
 				useIconTooltip: false
 
 			}, sap.m.Image).addStyleClass("sapMBtnCustomIcon").setParent(this, null, true);

package/src/sap/m/Carousel.js

@@ -101,7 +101,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/CarouselLayout.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"], function (ManagedObject) {
 	 * Applies a <code>sap.m.CarouselLayout</code> to a provided DOM element or Control.
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/m/CarouselRenderer.js

@@ -308,7 +308,8 @@ sap.ui.define([
 	 * effect with an offset for the page indicator.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRM The RenderManager that can be used for writing to the render output buffer
-	 * @param oPage the page to check
+	 * @param {sap.m.Carousel} oCarousel the carousel containg the page
+	 * @param {sap.ui.core.Control} oPage the page to check
 	 * @private
 	 */
 	CarouselRenderer._renderPageInScrollContainer = function (oRM, oCarousel, oPage) {

package/src/sap/m/CheckBox.js

@@ -13,8 +13,7 @@ sap.ui.define([
 	'sap/ui/core/EnabledPropagator',
 	'sap/ui/core/library',
 	'./CheckBoxRenderer',
-	"sap/ui/thirdparty/jquery",
-	"sap/ui/events/KeyCodes",
+	'sap/ui/events/KeyCodes',
 	'sap/ui/core/LabelEnablement',
 	'sap/ui/core/message/MessageMixin'
 ],
@@ -26,7 +25,6 @@ sap.ui.define([
 		EnabledPropagator,
 		coreLibrary,
 		CheckBoxRenderer,
-		jQuery,
 		KeyCodes,
 		LabelEnablement,
 		MessageMixin
@@ -88,7 +86,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColorPalette.js

@@ -104,7 +104,7 @@ sap.ui.define([
 		 * To prevent this, apps using the <code>ColorPalette</code> should also load the <code>sap.ui.unified</code> library in advance.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.js

@@ -38,7 +38,7 @@ sap.ui.define([
 		 * A thin wrapper over {@link sap.m.ColorPalette} allowing the latter to be used in a popover.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/Column.js

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnHeaderPopover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnListItem.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItemRenderer.js

@@ -29,6 +29,15 @@ sap.ui.define([
 	var ColumnListItemRenderer = Renderer.extend(ListItemBaseRenderer);
 	ColumnListItemRenderer.apiVersion = 2;
 
+	/**
+	 * Renders the HTML for the given control, using the provided
+	 * {@link sap.ui.core.RenderManager}.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm
+	 *            RenderManager that can be used to render the control's DOM
+	 * @param {sap.m.ColumnListItem} oLI
+	 *            The item to be rendered
+	 */
 	ColumnListItemRenderer.render = function(rm, oLI) {
 		var oTable = oLI.getTable();
 		if (!oTable) {
@@ -106,17 +115,6 @@ sap.ui.define([
 		return "";
 	};
 
-	/**
-	 * Renders the HTML for the given control, using the provided
-	 * {@link sap.ui.core.RenderManager}.
-	 *
-	 * @param {sap.ui.core.RenderManager}
-	 *            oRenderManager the RenderManager that can be used for writing to
-	 *            the Render-Output-Buffer
-	 * @param {sap.m.ColumnListItem}
-	 *            oControl an object representation of the control that should be
-	 *            rendered
-	 */
 	ColumnListItemRenderer.renderLIAttributes = function(rm, oLI) {
 		rm.class("sapMListTblRow");
 		var vAlign = oLI.getVAlign();

package/src/sap/m/ColumnPopoverActionItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/Button'], function(ColumnPopoverIte
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverCustomItem.js

@@ -17,7 +17,7 @@ sap.ui.define(['./ColumnPopoverItem', 'sap/m/ToggleButton'], function(ColumnPopo
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverItem.js

@@ -16,7 +16,7 @@ sap.ui.define(['sap/ui/core/Element'], function(Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.63

package/src/sap/m/ColumnPopoverSelectListItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.86

package/src/sap/m/ColumnPopoverSortItem.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.m.ColumnPopoverItem
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.0
 	 *
 	 * @constructor
 	 * @since 1.66

package/src/sap/m/ComboBox.js

@@ -108,7 +108,7 @@ sap.ui.define([
 		 * </ul>
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @extends sap.m.ComboBoxBase
@@ -1899,6 +1899,7 @@ sap.ui.define([
 
 			if (this.getValue() !== "") {
 				this.clearSelection();
+				this.bOpenedByKeyboardOrButton ? this.clearFilter() : this.close();
 				this.setProperty("effectiveShowClearIcon", false);
 			}
 		};

package/src/sap/m/ComboBoxBase.js

@@ -68,7 +68,7 @@ sap.ui.define([
 		 * @abstract
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ComboBoxTextField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 		 * @extends sap.m.InputBase
 		 *
 		 * @author SAP SE
-		 * @version 1.99.0
+		 * @version 1.100.0
 		 *
 		 * @constructor
 		 * @public