@openui5/sap.m 1.92.0 → 1.95.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.12
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -376,7 +370,7 @@ 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
 
-Component: Adaptive Cards, version: 1.2.3
+Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.m",
-  "version": "1.92.0",
+  "version": "1.95.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.92.0",
-    "@openui5/sap.ui.layout": "1.92.0",
-    "@openui5/sap.ui.unified": "1.92.0"
+    "@openui5/sap.ui.core": "1.95.0",
+    "@openui5/sap.ui.layout": "1.95.0",
+    "@openui5/sap.ui.unified": "1.95.0"
   }
 }

package/src/sap/m/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.92.0</version>
+  <version>1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+		 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/App.js

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.m.NavContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -198,6 +198,10 @@ sap.ui.define([
 	};
 
 	App.prototype._adjustParentsHeight = function () {
+		if (!this.getDomRef()) {
+			return;
+		}
+
 		var ref = this.getDomRef().parentNode;
 		// set all parent elements to 100% height this *should* be done by the application in CSS, but people tend to forget it...
 		while (ref && ref !== document.documentElement) {

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.92.0
+		 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -133,9 +133,6 @@ sap.ui.define([
 				fallbackIcon: {type: "string", group: "Data", defaultValue: null},
 				/**
 				 * Determines the background color of the control.
-				 *
-				 * <b>Note:</b> By using background colors from the predefined sets,
-				 * your colors can later be customized from the Theme Designer.
 				 */
 				backgroundColor: {type: "sap.m.AvatarColor", group: "Appearance", defaultValue: AvatarColor.Accent6},
 

package/src/sap/m/Bar.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @implements sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -221,7 +221,7 @@ sap.ui.define([
 		this._removeAllListeners();
 
 		var bContentLeft = !!this.getContentLeft().length,
-			bContentMiddle = !!this.getContentMiddle().length,
+			bContentMiddle = !!this.getContentMiddle().length || (this._oflexBox && !!this._oflexBox.getItems().length),
 			bContentRight = !!this.getContentRight().length;
 
 		//Invisible bars also do not need resize listeners
@@ -335,15 +335,20 @@ sap.ui.define([
 		var iMidBarPlaceholderWidth = this._$MidBarPlaceHolder.outerWidth(true),
 			bRtl = sap.ui.getCore().getConfiguration().getRTL(),
 			sLeftOrRight = bRtl ? "right" : "left",
-			oMidBarCss = { visibility : "" };
+			sRightOrLeft = bRtl ? "left" : "right",
+			oMidBarCss = { visibility : "" },
+			aContentLeftControls = this.getContentLeft().filter(function(oControl) { return oControl.getVisible(); }),
+			aContentRightControls = this.getContentRight().filter(function(oControl) { return oControl.getVisible(); }),
+			iContentLeftPadding = aContentLeftControls.length ? 0 : parseInt(this._$LeftBar.css('padding-' + sLeftOrRight)),
+			iContentRightPadding = aContentRightControls.length ? 0 : parseInt(this._$RightBar.css('padding-' + sRightOrLeft));
 
 		if (this.getEnableFlexBox()) {
 
 			iMidBarPlaceholderWidth = iBarWidth - iLeftBarWidth - iRightBarWidth - parseInt(this._$MidBarPlaceHolder.css('margin-left')) - parseInt(this._$MidBarPlaceHolder.css('margin-right'));
 
 			oMidBarCss.position = "absolute";
-			oMidBarCss.width = iMidBarPlaceholderWidth + "px";
-			oMidBarCss[sLeftOrRight] = iLeftBarWidth;
+			oMidBarCss.width = iMidBarPlaceholderWidth + iContentLeftPadding + iContentRightPadding + "px";
+			oMidBarCss[sLeftOrRight] = iLeftBarWidth - iContentLeftPadding;
 
 			//calculation for flex is done
 			return oMidBarCss;
@@ -364,9 +369,10 @@ sap.ui.define([
 			oMidBarCss.position = "absolute";
 
 			//Use the remaining space
-			oMidBarCss.width = iSpaceBetweenLeftAndRight + "px";
+			oMidBarCss.width = iSpaceBetweenLeftAndRight + iContentLeftPadding + iContentRightPadding + "px";
 
-			oMidBarCss.left = bRtl ? iRightBarWidth : iLeftBarWidth;
+			//Set left or right depending on LTR/RTL
+			oMidBarCss[sLeftOrRight] = iLeftBarWidth - iContentLeftPadding;
 		}
 
 		return oMidBarCss;
@@ -483,6 +489,7 @@ sap.ui.define([
 	 *
 	 * @returns {Object} with all available contexts
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype.getContext = BarInAnyContentEnabler.prototype.getContext;
 
@@ -492,6 +499,7 @@ sap.ui.define([
 	 * Implementation of the IBar interface.
 	 * @returns {boolean} isContextSensitive
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype.isContextSensitive = BarInAnyContentEnabler.prototype.isContextSensitive;
 
@@ -500,12 +508,15 @@ sap.ui.define([
 	 * @param {sap.m.IBarHTMLTag} sTag The HTML tag of the root element
 	 * @returns {sap.m.IBar} this for chaining
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype.setHTMLTag = BarInAnyContentEnabler.prototype.setHTMLTag;
+
 	/**
 	 * Gets the HTML tag of the root element.
 	 * @returns {sap.m.IBarHTMLTag} The HTML-tag
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype.getHTMLTag  = BarInAnyContentEnabler.prototype.getHTMLTag;
 
@@ -513,6 +524,7 @@ sap.ui.define([
 	 * Sets classes and HTML tag according to the context of the page. Possible contexts are header, footer and subheader.
 	 * @returns {sap.m.IBar} <code>this</code> for chaining
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype.applyTagAndContextClassFor  = BarInAnyContentEnabler.prototype.applyTagAndContextClassFor;
 
@@ -520,6 +532,7 @@ sap.ui.define([
 	 * Sets classes according to the context of the page. Possible contexts are header, footer and subheader.
 	 * @returns {sap.m.IBar} <code>this</code> for chaining
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype._applyContextClassFor  = BarInAnyContentEnabler.prototype._applyContextClassFor;
 
@@ -527,6 +540,7 @@ sap.ui.define([
 	 * Sets HTML tag according to the context of the page. Possible contexts are header, footer and subheader.
 	 * @returns {sap.m.IBar} <code>this</code> for chaining
 	 * @protected
+	 * @function
 	 */
 	Bar.prototype._applyTag  = BarInAnyContentEnabler.prototype._applyTag;
 
@@ -537,6 +551,7 @@ sap.ui.define([
 	 * @param {string} sContext allowed values are header, footer, subheader.
 	 * @returns {object|null}
 	 * @private
+	 * @function
 	 */
 	Bar.prototype._getContextOptions  = BarInAnyContentEnabler.prototype._getContextOptions;
 
@@ -546,6 +561,7 @@ sap.ui.define([
 	 * @param {string} sRole AccessibilityRole of the root Element
 	 * @returns {sap.m.IBar} <code>this</code> to allow method chaining
 	 * @private
+	 * @function
 	 */
 	Bar.prototype._setRootAccessibilityRole = BarInAnyContentEnabler.prototype._setRootAccessibilityRole;
 
@@ -554,6 +570,7 @@ sap.ui.define([
 	 *
 	 * @returns {string} Accessibility role
 	 * @private
+	 * @function
 	 */
 	Bar.prototype._getRootAccessibilityRole = BarInAnyContentEnabler.prototype._getRootAccessibilityRole;
 
@@ -564,6 +581,7 @@ sap.ui.define([
 	 * @param {string} sLevel aria-level attribute of the root Element
 	 * @returns {sap.m.IBar} <code>this</code> to allow method chaining
 	 * @private
+	 * @function
 	 */
 	Bar.prototype._setRootAriaLevel = BarInAnyContentEnabler.prototype._setRootAriaLevel;
 
@@ -573,6 +591,7 @@ sap.ui.define([
 	 * This is only needed if <code>sap.m.Bar</code> has role="heading"
 	 * @returns {string} aria-level
 	 * @private
+	 * @function
 	 */
 	Bar.prototype._getRootAriaLevel = BarInAnyContentEnabler.prototype._getRootAriaLevel;
 

package/src/sap/m/Breadcrumbs.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -388,7 +388,7 @@ sap.ui.define([
 	};
 
 	Breadcrumbs.prototype._getItemsForMobile = function () {
-		var oItems = this.getLinks();
+		var oItems = this.getLinks().filter(function (oLink) { return oLink.getVisible(); });
 
 		if (this.getCurrentLocationText()) {
 			oItems.push(this._getCurrentLocation());

package/src/sap/m/BusyDialog.js

@@ -62,7 +62,7 @@ sap.ui.define(['./library',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.92.0
+		 * @version 1.95.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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -352,7 +352,10 @@ sap.ui.define([
 	 * @private
 	 */
 	Button.prototype._getBadgeInvisibleText = function() {
-		return this._oBadgeInvisibleText || (this._oBadgeInvisibleText = new InvisibleText(this.getId() + "-badge").toStatic());
+		if (!this._oBadgeInvisibleText) {
+			this._oBadgeInvisibleText = new InvisibleText(this.getId() + "-badge").toStatic();
+		}
+		return this._oBadgeInvisibleText;
 	};
 
 	/**
@@ -376,6 +379,8 @@ sap.ui.define([
 			this._oBadgeData = null;
 		}
 
+		this._bFocused = null;
+
 		this.$().off("mouseenter", this._onmouseenter);
 	};
 
@@ -384,16 +389,16 @@ sap.ui.define([
 
 		switch (sButtonType) {
 			case ButtonType.Critical:
-				this._sTypeIconURI = "sap-icon://message-warning";
+				this._sTypeIconURI = "sap-icon://alert";
 				break;
 			case ButtonType.Negative:
-				this._sTypeIconURI = "sap-icon://message-error";
+				this._sTypeIconURI = "sap-icon://error";
 				break;
 			case ButtonType.Success:
-				this._sTypeIconURI = "sap-icon://message-success";
+				this._sTypeIconURI = "sap-icon://sys-enter-2";
 				break;
 			case ButtonType.Neutral:
-				this._sTypeIconURI = "sap-icon://message-information";
+				this._sTypeIconURI = "sap-icon://information";
 				break;
 			case ButtonType.Back:
 			case ButtonType.Up:
@@ -425,6 +430,10 @@ sap.ui.define([
 			this._bRenderActive = this._bActive;
 		}
 
+		if (this._bFocused) {
+			this._toggleLiveChangeAnnouncement("polite");
+		}
+
 		this.$().on("mouseenter", this._onmouseenter);
 	};
 
@@ -627,16 +636,43 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Add aria-live attributes.
+	 *
+	 * @private
+	 */
+	Button.prototype.onfocusin = function() {
+		this._bFocused = true;
+		this._toggleLiveChangeAnnouncement("polite");
+	};
+
 	/**
 	 * Ensure that the active button state is removed by focus loss.
+	 * Disable aria-live attributes.
 	 *
 	 * @private
 	 */
 	Button.prototype.onfocusout = function() {
 		this._buttonPressed = false;
+		this._bFocused = false;
 		this._sTouchStartTargetId = '';
 		// set inactive button state
 		this._inactiveButton();
+		this._toggleLiveChangeAnnouncement("off");
+	};
+
+	/**
+	 * Enables or disables dynamic text or icon change announcmenets
+	 *
+	 * @param {*} sValue aria-live attribute value
+	 * @private
+	 */
+	Button.prototype._toggleLiveChangeAnnouncement = function(sValue) {
+		if (this._getText()) {
+			this.$("BDI-content").attr("aria-live", sValue);
+		} else if (this._getAppliedIcon()) {
+			this.$("tooltip").attr("aria-live", sValue);
+		}
 	};
 
 	/**

package/src/sap/m/Carousel.js

@@ -99,7 +99,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -569,9 +569,17 @@ sap.ui.define([
 	 * @private
 	 */
 	Carousel.prototype._setWidthOfPages = function (iNumberOfItemsToShow) {
-		var iItemWidth = this._calculatePagesWidth(iNumberOfItemsToShow);
+		var $items = this.$().find(".sapMCrslItem"),
+			iItemWidth;
 
-		this.$().find(".sapMCrslItem").each(function (iIndex, oPage) {
+		if (!$items.length) {
+			// pages are not yet rendered, calculation will be done in the next onAfterRendering
+			return;
+		}
+
+		iItemWidth = this._calculatePagesWidth(iNumberOfItemsToShow);
+
+		$items.each(function (iIndex, oPage) {
 			oPage.style.width = iItemWidth  + "%";
 		});
 	};

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.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -343,12 +343,16 @@ sap.ui.define([
 		}
 	};
 
-	CheckBox.prototype.getFormFormattedValue = function() {
+	CheckBox.prototype.getFormattedState = function() {
 		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 
 		return this.getSelected() ? oBundle.getText("ACC_CTR_STATE_CHECKED") : oBundle.getText("ACC_CTR_STATE_NOT_CHECKED");
 	};
 
+	CheckBox.prototype.getFormFormattedValue = function() {
+		return this.getFormattedState();
+	};
+
 	CheckBox.prototype.getFormValueProperty = function () {
 		return "selected";
 	};
@@ -541,11 +545,12 @@ sap.ui.define([
 	 * @returns {object} The <code>sap.m.CheckBox</code> accessibility information
 	 */
 	CheckBox.prototype.getAccessibilityInfo = function() {
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m"),
+			sText = this.getText();
 		return {
 			role: "checkbox",
 			type: oBundle.getText("ACC_CTR_TYPE_CHECKBOX"),
-			description: (this.getText() || "") + (this.getSelected() ? (" " + oBundle.getText("ACC_CTR_STATE_CHECKED")) : ""),
+			description: (sText ? sText + " " : "") + this.getFormattedState(),
 			focusable: this.getEnabled() && !this.getDisplayOnly(),
 			enabled: this.getEnabled(),
 			editable: this.getEditable()

package/src/sap/m/CheckBoxRenderer.js

@@ -87,7 +87,7 @@ sap.ui.define(['sap/ui/core/library', 'sap/ui/core/ValueStateSupport', 'sap/ui/D
 
 		var sTooltip = this.getTooltipText(oCheckBox);
 
-		if (sTooltip && (bEditable || bEnabled)) {
+		if (sTooltip) {
 			oRm.attr("title", sTooltip);
 		}
 
@@ -179,13 +179,22 @@ sap.ui.define(['sap/ui/core/library', 'sap/ui/core/ValueStateSupport', 'sap/ui/D
 	 */
 	CheckBoxRenderer.getTooltipText = function (oCheckBox) {
 		var sValueStateText = oCheckBox.getProperty("valueStateText"),
-			sTooltipText = oCheckBox.getTooltip_AsString();
+			sTooltipText = oCheckBox.getTooltip_AsString(),
+			bEnabled = oCheckBox.getEnabled(),
+			bEditable = oCheckBox.getEditable();
 
 		if (sValueStateText) {
+			// custom value state text is set, concat to tooltip and return
 			return (sTooltipText ? sTooltipText + " - " : "") + sValueStateText;
-		} else {
+		} else if (bEditable && bEnabled) {
+			// the visual value state is only set for editable and enabled checkboxes
+			// the default value state text should only be set in those cases
 			return ValueStateSupport.enrichTooltip(oCheckBox, sTooltipText);
 		}
+
+		// if no value state text is provided or the checkbox
+		// is disabled only the custom tooltip is returned
+		return sTooltipText;
 	};
 
 	return CheckBoxRenderer;

package/src/sap/m/ColorPalette.js

@@ -108,7 +108,7 @@ sap.ui.define([
 		 * <code>ColorPalette</code> should also load the <code>sap.ui.unified</code> library.
 		 *
 		 * @extends sap.ui.core.Control
-		 * @version 1.92.0
+		 * @version 1.95.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.js

@@ -43,7 +43,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.92.0
+		 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -393,6 +393,14 @@ sap.ui.define([
 		this._index = +nIndex;
 	};
 
+	/**
+	 * Gets the rendering index of the column
+	 *
+	 * @protected
+	 */
+	Column.prototype.getIndex = function() {
+		return this._index;
+	};
 
 	/**
 	 * Sets the order of the column

package/src/sap/m/ColumnHeaderPopover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.92.0
+	 * @version 1.95.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.92.0
+	 * @version 1.95.0
 	 *
 	 * @constructor
 	 * @public
@@ -243,7 +243,13 @@ sap.ui.define([
 			aCells = this.getCells(),
 			aColumns = oTable.getColumns(true);
 
-		aColumns.forEach(function(oColumn) {
+		aColumns.sort(function(oCol1, oCol2) {
+			var iCol1Index = oCol1.getIndex(), iCol2Index = oCol2.getIndex(), iIndexDiff = iCol1Index - iCol2Index;
+			if (iIndexDiff == 0) { return 0; }
+		    if (iCol1Index < 0) { return 1; }
+		    if (iCol2Index < 0) { return -1; }
+		    return iIndexDiff;
+		}).forEach(function(oColumn) {
 			var oCell = aCells[oColumn.getInitialOrder()];
 			if (!oCell || !oColumn.getVisible() || (oColumn.isHidden() && !oColumn.isPopin())) {
 				return;