@openui5/sap.m 1.97.1 → 1.98.0

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -60,7 +60,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -75,35 +75,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -115,14 +115,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -149,7 +149,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -281,14 +281,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -322,7 +322,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -334,7 +334,7 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
@@ -370,21 +370,11 @@ Comment: these files belong to: Buttons extension for DataTables
 
 # Library: sap.ui.integration:
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-Comment: these files belong to: Webcomponentsjs
-
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-Comment: these files belong to: Unicode Common Locale Data Repository
-
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 Copyright: 2017 Microsoft
 License: MIT
@@ -395,22 +385,27 @@ Copyright: 2017 Microsoft
 License: MIT
 Comment: these files belong to: Adaptive Cards Templating
 
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+Copyright: Microsoft
+License: MIT
+Comment: these files belong to: Adaptive Expressions
+
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
-Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
+Copyright: 2020 Jeremy Danyow
 License: MIT
-Comment: these files belong to: ajv
+Comment: these files belong to: @cfworker/json-schema
 
 
 # Library: sap.ui.mdc:
 
 Files: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2015 unnikked
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
@@ -454,7 +449,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -351,24 +351,11 @@ Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/D
 
 Library: sap.ui.integration:
 
-Component: UI5 Web Components, version: 1.0.0-rc.8
+Component: UI5 Web Components, version: 1.0.1
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json
-	src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
-
-Component: Webcomponentsjs, version: 1.0.2
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-
-Component: Unicode Common Locale Data Repository
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 
 Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
@@ -377,23 +364,29 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js
 	src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 
-Component: Adaptive Cards Templating, version: 0.1.1-alpha.0
+Component: Adaptive Cards Templating, version: 2.2.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards-templating.js
 
-Component: Markdown-it, version: 10.0.0
+Component: Adaptive Expressions, version: 4.15.0
+Copyright: Microsoft
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+
+Component: Markdown-it, version: 12.2.0
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
+Component: @cfworker/json-schema, version: 1.6.8
+Copyright: 2020 Jeremy Danyow
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
 Library: sap.ui.mdc:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.m",
-  "version": "1.97.1",
+  "version": "1.98.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.97.1",
-    "@openui5/sap.ui.layout": "1.97.1",
-    "@openui5/sap.ui.unified": "1.97.1"
+    "@openui5/sap.ui.core": "1.98.0",
+    "@openui5/sap.ui.layout": "1.98.0",
+    "@openui5/sap.ui.unified": "1.98.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.97.1</version>
+  <version>1.98.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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

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.97.1
+		 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -510,17 +510,17 @@ sap.ui.define([
 			oInvisibleText = new InvisibleText(sButtonId + "-actionSheetHiddenText");
 
 			this.addAggregation("_invisibleAriaTexts", oInvisibleText, false);
-			oButton.addAriaLabelledBy(oInvisibleText.getId());
+			oButton.addAriaDescribedBy(oInvisibleText.getId());
 		}
 	};
 
 	ActionSheet.prototype._removeAriaHiddenTexts = function(oButton) {
-		oButton.getAriaLabelledBy().forEach(function(sId) {
+		oButton.getAriaDescribedBy().forEach(function(sId) {
 			var oControl = sap.ui.getCore().byId(sId);
 
 			if (oControl instanceof InvisibleText && sId.indexOf("actionSheetHiddenText") > -1) {
 				this.removeAggregation("_invisibleAriaTexts", oControl, false);
-				oButton.removeAriaLabelledBy(oControl);
+				oButton.removeAriaDescribedBy(oControl);
 				oControl.destroy();
 			}
 		}, this);

package/src/sap/m/App.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.m.NavContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.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.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/Avatar.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Bar.js

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

package/src/sap/m/Breadcrumbs.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/BusyDialog.js

@@ -62,7 +62,7 @@ sap.ui.define(['./library',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Carousel.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/m/CheckBox.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -261,7 +261,6 @@ sap.ui.define([
 	 * Lifecycle Methods
 	 */
 	CheckBox.prototype.init = function() {
-		this.addActiveState(this);
 		this._handleReferencingLabels();
 	};
 
@@ -326,23 +325,6 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
-	 * Add ActiveState to non-supported mobile platform
-	 * @private
-	 */
-	CheckBox.prototype.addActiveState = function(oControl) {
-		if (Device.os.blackberry) {
-			oControl.addDelegate({
-				ontouchstart: function(oEvent){
-					jQuery(oControl.getDomRef()).addClass("sapMActive");
-				},
-				ontouchend: function(oEvent){
-					jQuery(oControl.getDomRef()).removeClass("sapMActive");
-				}
-			});
-		}
-	};
-
 	CheckBox.prototype.getFormattedState = function() {
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
@@ -457,9 +439,7 @@ sap.ui.define([
 	 */
 	CheckBox.prototype._getLabel = function() {
 		if (!this._oLabel) {
-			this._oLabel = new Label(this.getId() + "-label", {
-				labelFor: this.getId()
-			}).addStyleClass("sapMCbLabel");
+			this._oLabel = new Label(this.getId() + "-label").addStyleClass("sapMCbLabel");
 
 			this.setAggregation("_label", this._oLabel, true);
 		}

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.97.1
+		 * @version 1.98.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.97.1
+		 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -197,6 +197,15 @@ sap.ui.define([
 			 */
 			footer : {type : "sap.ui.core.Control", multiple : false}
 		},
+		associations: {
+			/**
+			 * Provides a menu that is used by the column.
+			 * The given menu has to follow the same pattern as the <code>sap.ui.core.IColumnHeaderMenu</code> interface.
+			 *
+			 * @since 1.98.0
+			 */
+			columnHeaderMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
+		},
 		designtime: "sap/m/designtime/Column.designtime"
 	}});
 
@@ -298,13 +307,12 @@ sap.ui.define([
 		this._media = oMedia;
 		this._media.matches = !!oMedia.from;
 
-		// make sure that the column is visible
-		if (!this.getVisible()) {
-			return;
-		}
-
 		// inform parent delayed
 		setTimeout(function() {
+			// make sure that the column is visible
+			if (!this.getVisible()) {
+				return;
+			}
 			this.fireEvent("media", this);
 			this.informTable("Resize");
 		}.bind(this), 0);
@@ -682,7 +690,7 @@ sap.ui.define([
 	// hence overwriting the getFocusDomRef to restore the focus on the active column header
 	Column.prototype.getFocusDomRef = function() {
 		var oParent = this.getParent();
-		if (oParent && (oParent.bActiveHeaders || oParent.bFocusableHeaders)) {
+		if (oParent && (oParent.bActiveHeaders || oParent.bFocusableHeaders || this.getAssociation("columnHeaderMenu"))) {
 			var oColumnDomRef = this.getDomRef();
 			if (oColumnDomRef) {
 				return oColumnDomRef.firstChild;
@@ -706,6 +714,17 @@ sap.ui.define([
 		this._setMinScreenWidth(bForcedColumn ? "" : this.getMinScreenWidth());
 	};
 
+	/**
+	 * Returns the <code>sap.ui.core.IColumnHeaderMenu<\code>, which is the current target of the association <code>columnHeaderMenu</code>, or null.
+	 *
+	 * @returns {sap.ui.core.IColumnHeaderMenu}
+	 * @since 1.98.0
+	 * @public
+	 */
+	Column.prototype.getColumnHeaderMenu = function () {
+		return sap.ui.getCore().byId(this.getAssociation("columnHeaderMenu"));
+	};
+
 	return Column;
 
 });

package/src/sap/m/ColumnHeaderPopover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ColumnListItemRenderer.js

@@ -311,6 +311,10 @@ sap.ui.define([
 			rm.openStart("div");
 			rm.class("sapMListTblSubCntRow");
 
+			if (sPopinDisplay == PopinDisplay.Inline) {
+				rm.class("sapMListTblSubCntRowInline");
+			}
+
 			aStyleClass && aStyleClass.forEach(function(sClassName) {
 				rm.class(sClassName);
 			});
@@ -323,10 +327,9 @@ sap.ui.define([
 				oColumn.addDependent(oHeader);
 				oLI._addClonedHeader(oHeader);
 				rm.renderControl(oHeader);
-				rm.close("div");
-
-				rm.openStart("div").class("sapMListTblSubCntSpr").openEnd();
-				rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_POPIN_LABEL_COLON"));
+				rm.openStart("span").class("sapMListTblSubCntSpr");
+				rm.attr("data-popin-colon", Core.getLibraryResourceBundle("sap.m").getText("TABLE_POPIN_LABEL_COLON"));
+				rm.openEnd().close("span");
 				rm.close("div");
 			}
 

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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.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.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @since 1.63