@openui5/sap.m 1.117.1 → 1.119.0

package/THIRDPARTY.txt

@@ -401,7 +401,7 @@ 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
+Component: Markdown-it, version: 12.3.2
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -466,7 +466,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.4.2
+Component: SAP Theming Base Content, version: 11.6.8
 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.117.1",
+  "version": "1.119.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.117.1",
-    "@openui5/sap.ui.layout": "1.117.1",
-    "@openui5/sap.ui.unified": "1.117.1"
+    "@openui5/sap.ui.core": "1.119.0",
+    "@openui5/sap.ui.layout": "1.119.0",
+    "@openui5/sap.ui.unified": "1.119.0"
   }
 }

package/src/sap/m/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.117.1</version>
+  <version>1.119.0</version>
 
   <documentation>The main UI5 control library, with responsive controls that can be used in touch devices as well as desktop browsers.</documentation>
 
@@ -151,6 +151,21 @@
                 <module>sap/m/plugins/DataStateIndicator</module>
                 <module>sap/m/plugins/ColumnResizer</module>
                 <module>sap/m/plugins/PasteProvider</module>
+                <module>sap/m/table/columnmenu/ActionItem</module>
+                <module>sap/m/table/columnmenu/Category</module>
+                <module>sap/m/table/columnmenu/Entry</module>
+                <module>sap/m/table/columnmenu/Item</module>
+                <module>sap/m/table/columnmenu/ItemBase</module>
+                <module>sap/m/table/columnmenu/Menu</module>
+                <module>sap/m/table/columnmenu/QuickAction</module>
+                <module>sap/m/table/columnmenu/QuickActionBase</module>
+                <module>sap/m/table/columnmenu/QuickActionItem</module>
+                <module>sap/m/table/columnmenu/QuickGroup</module>
+                <module>sap/m/table/columnmenu/QuickGroupItem</module>
+                <module>sap/m/table/columnmenu/QuickSort</module>
+                <module>sap/m/table/columnmenu/QuickSortItem</module>
+                <module>sap/m/table/columnmenu/QuickTotal</module>
+                <module>sap/m/table/columnmenu/QuickTotalItem</module>
             </modules>
         </component>
     </ownership>

package/src/sap/m/AccButton.js

@@ -21,7 +21,7 @@ sap.ui.define(['./Button','./AccButtonRenderer'],
 	 * @extends sap.m.Button
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.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.117.1
+	 * @version 1.119.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.117.1
+		 * @version 1.119.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ActionSheet.js

@@ -72,7 +72,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ActionTile.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	* @extends sap.m.GenericTile
 	*
 	* @author SAP SE
-	* @version 1.117.1
+	* @version 1.119.0
 	* @since 1.107.0
 	*
 	* @private

package/src/sap/m/ActionTileContent.js

@@ -27,7 +27,7 @@ sap.ui.define([
      * @extends sap.m.TileContent
      *
      * @author SAP SE
-     * @version 1.117.1
+     * @version 1.119.0
      * @since 1.107.0
      *
      * @private

package/src/sap/m/AdditionalTextButton.js

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

package/src/sap/m/App.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.m.NavContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.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.117.1
+		 * @version 1.119.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/Avatar.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -469,10 +469,10 @@ sap.ui.define([
 			return;
 		}
 		this.firePress({/* no parameters */});
-		if (this.hasListeners("press")) {
-			this.isPressed = !this.isPressed;
-			this.toggleStyleClass("sapMAvatarPressed", this._isPressed);
-		}
+		// if (this.hasListeners("press")) {
+		// 	this.isPressed = !this.isPressed;
+		// 	this.toggleStyleClass("sapMAvatarPressed", this._isPressed);
+		// }
 	};
 
 	/**

package/src/sap/m/Bar.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @implements sap.m.IBar
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -170,6 +170,9 @@ sap.ui.define([
 	Bar.prototype.exit = function() {
 		this._removeAllListeners();
 
+		/**
+		 * @deprecated As of version 1.16
+		 */
 		if (this._oflexBox) {
 
 			this._oflexBox.destroy();
@@ -225,9 +228,16 @@ sap.ui.define([
 		this._removeAllListeners();
 
 		var bContentLeft = !!this.getContentLeft().length,
-			bContentMiddle = !!this.getContentMiddle().length || (this._oflexBox && !!this._oflexBox.getItems().length),
+			bContentMiddle = !!this.getContentMiddle().length,
 			bContentRight = !!this.getContentRight().length;
 
+		/**
+		 * @deprecated As of version 1.16
+		 */
+		 if (!bContentMiddle){
+			bContentMiddle = (this._oflexBox && !!this._oflexBox.getItems().length);
+		}
+
 		//Invisible bars also do not need resize listeners
 		if (!this.getVisible()) {
 			return;
@@ -245,23 +255,29 @@ sap.ui.define([
 
 		this._sResizeListenerId = ResizeHandler.register(this.getDomRef(), jQuery.proxy(this._handleResize, this));
 
-		if (!this.getEnableFlexBox()) {
-			if (bContentLeft) {
-				this._sResizeListenerIdLeft = ResizeHandler.register(this._$LeftBar[0], jQuery.proxy(this._handleResize, this));
-			} else {
-				this._$LeftBar.addClass("sapMBarEmpty");
-			}
+		/**
+		 * @deprecated As of version 1.16
+		 */
+		if (this.getEnableFlexBox()){
+			this._updatePosition(bContentLeft, bContentMiddle, bContentRight);
+			return;
+		}
 
-			if (bContentMiddle) {
-				this._sResizeListenerIdMid = ResizeHandler.register(this._$MidBarPlaceHolder[0], jQuery.proxy(this._handleResize, this));
-			} else {
-				this._$MidBarPlaceHolder.addClass("sapMBarEmpty");
-			}
-			if (bContentRight) {
-				this._sResizeListenerIdRight = ResizeHandler.register(this._$RightBar[0], jQuery.proxy(this._handleResize, this));
-			} else {
-				this._$RightBar.addClass("sapMBarEmpty");
-			}
+		if (bContentLeft) {
+			this._sResizeListenerIdLeft = ResizeHandler.register(this._$LeftBar[0], jQuery.proxy(this._handleResize, this));
+		} else {
+			this._$LeftBar.addClass("sapMBarEmpty");
+		}
+
+		if (bContentMiddle) {
+			this._sResizeListenerIdMid = ResizeHandler.register(this._$MidBarPlaceHolder[0], jQuery.proxy(this._handleResize, this));
+		} else {
+			this._$MidBarPlaceHolder.addClass("sapMBarEmpty");
+		}
+		if (bContentRight) {
+			this._sResizeListenerIdRight = ResizeHandler.register(this._$RightBar[0], jQuery.proxy(this._handleResize, this));
+		} else {
+			this._$RightBar.addClass("sapMBarEmpty");
 		}
 
 		this._updatePosition(bContentLeft, bContentMiddle, bContentRight);
@@ -347,10 +363,13 @@ sap.ui.define([
 	Bar.prototype._getMidBarCss = function(iRightBarWidth, iBarWidth, iLeftBarWidth) {
 		var iMidBarPlaceholderWidth = this._$MidBarPlaceHolder.outerWidth(true),
 			bRtl = Configuration.getRTL(),
-			sLeftOrRight = bRtl ? "right" : "left",
 			oMidBarCss = { visibility : "" };
 
+		/**
+		 * @deprecated As of version 1.16
+		 */
 		if (this.getEnableFlexBox()) {
+			var sLeftOrRight = bRtl ? "right" : "left";
 
 			iMidBarPlaceholderWidth = iBarWidth - iLeftBarWidth - iRightBarWidth - parseInt(this._$MidBarPlaceHolder.css('margin-left')) - parseInt(this._$MidBarPlaceHolder.css('margin-right'));
 

package/src/sap/m/BarRenderer.js

@@ -49,6 +49,9 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 			"level":  oControl._getRootAriaLevel()
 		});
 
+		/**
+		 * @deprecated since version 1.18.6.
+		 */
 		if (oControl.getTranslucent() && Device.support.touch) {
 			oRM.class("sapMBarTranslucent");
 		}
@@ -86,7 +89,13 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 		oRM.openStart("div", oControl.getId() + "-BarMiddle");
 		oRM.class("sapMBarMiddle");
 		oRM.openEnd();
+
+		var bFlexBox = false;
+		/**
+		 * @deprecated As of version 1.16
+		 */
 		if (oControl.getEnableFlexBox()) {
+			bFlexBox = true;
 			oControl._oflexBox = oControl._oflexBox
 				|| new HBox(oControl.getId() + "-BarPH", {
 					alignItems: "Center"
@@ -103,7 +112,9 @@ sap.ui.define(['./BarInPageEnabler', 'sap/ui/Device', "sap/base/Log", 'sap/m/HBo
 			});
 
 			oRM.renderControl(oControl._oflexBox);
-		} else {
+		}
+
+		if (!bFlexBox) {
 			oRM.openStart("div", oControl.getId() + "-BarPH");
 			oRM.class("sapMBarPH");
 			oRM.class("sapMBarContainer");

package/src/sap/m/Breadcrumbs.js

@@ -7,6 +7,8 @@
 // Provides control sap.m.Breadcrumbs.
 sap.ui.define([
 	"sap/ui/core/Control",
+	"sap/ui/dom/units/Rem",
+	"sap/ui/core/theming/Parameters",
 	"sap/ui/util/openWindow",
 	"sap/m/Text",
 	"sap/m/Link",
@@ -22,6 +24,8 @@ sap.ui.define([
 	'sap/ui/core/InvisibleText'
 ], function(
 	Control,
+	Rem,
+	Parameters,
 	openWindow,
 	Text,
 	Link,
@@ -64,7 +68,7 @@ sap.ui.define([
 	 * @implements sap.m.IBreadcrumbs, sap.m.IOverflowToolbarContent, sap.ui.core.IShrinkable
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -155,6 +159,14 @@ sap.ui.define([
 		this._sSeparatorSymbol = Breadcrumbs.STYLE_MAPPER[this.getSeparatorStyle()];
 		this._aCachedInvisibleTexts = [];
 		this._getInvisibleText();
+		this.MIN_WIDTH_IN_OFT = parseInt(Parameters.get({
+			name: "_sap_m_Breadcrumbs_MinWidth_OFT",
+			callback: function(sValue) {
+				this.MIN_WIDTH_IN_OFT = parseInt(sValue);
+				this._iMinWidth = this.MIN_WIDTH_IN_OFT;
+			}.bind(this)
+		}));
+		this._iMinWidth = this.MIN_WIDTH_IN_OFT;
 	};
 
 	Breadcrumbs.prototype.onBeforeRendering = function () {
@@ -184,10 +196,43 @@ sap.ui.define([
 		}
 
 		this._configureKeyboardHandling();
+		this._setMinWidth();
 
 		this.bRenderingPhase = false;
 	};
 
+	Breadcrumbs.prototype._setMinWidth = function () {
+		var oCurrentLocation = this._getCurrentLocation(),
+			iWidth,
+			iDefaultMinWidthOFT;
+		// When in OFT, set min-width=width of the currentLocationText, so that it won't be truncated too much, before going into the overflow menu
+		if (this.$().hasClass("sapMTBShrinkItem")) {
+
+			if (!this._iMinWidth || this._iMinWidth !== this.MIN_WIDTH_IN_OFT) {
+				return;
+			}
+
+			this.$().removeClass("sapMTBShrinkItem");
+			iWidth = oCurrentLocation.$().width();
+
+			// Theme parameters should be resolved when reaching this point
+			iDefaultMinWidthOFT = Rem.toPx(Parameters.get({
+				name: "_sap_m_Toolbar_ShrinkItem_MinWidth",
+				callback: function(sValue) {
+					iDefaultMinWidthOFT = Rem.toPx(sValue);
+				}
+			}));
+			this.$().addClass("sapMTBShrinkItem");
+
+			if (iWidth > iDefaultMinWidthOFT) {
+				this.$().css("min-width", iWidth);
+			}
+
+			this.fireEvent("_minWidthChange");
+			this._iMinWidth = iWidth;
+		}
+	};
+
 	Breadcrumbs.prototype.onThemeChanged = function () {
 		this._resetControl();
 	};
@@ -729,6 +774,8 @@ sap.ui.define([
 
 		if (oCurrentLocation.getText() !== sText) {
 			oCurrentLocation.setText(sText);
+			// Enable new measuring of the currentLocationText
+			this._iMinWidth = this.MIN_WIDTH_IN_OFT;
 			this._resetControl();
 		}
 
@@ -789,12 +836,18 @@ sap.ui.define([
 			canOverflow: true,
 			getCustomImportance: function () {
 				return "Medium";
-			}
+			},
+			invalidationEvents: ["_minWidthChange"],
+			onAfterExitOverflow: this._onAfterExitOverflow.bind(this)
 		};
 
 		return oConfig;
 	};
 
+	Breadcrumbs.prototype._onAfterExitOverflow = function () {
+		this._resetControl();
+	};
+
 	/**
 	 * Required by the {@link sap.m.IToolbarInteractiveControl} interface.
 	 * Determines if the Control is interactive.

package/src/sap/m/BreadcrumbsRenderer.js

@@ -42,6 +42,10 @@ sap.ui.define(["sap/m/Text"], function (Text) {
 			}
 		});
 
+		if (oControl._iMinWidth && oControl._iMinWidth !== oControl.MIN_WIDTH_IN_OFT) {
+			oRm.style("min-width", oControl._iMinWidth + "px");
+		}
+
 		oRm.openEnd();
 		oRm.openStart("ol");
 		oRm.openEnd();

package/src/sap/m/BusyDialog.js

@@ -62,7 +62,7 @@ sap.ui.define(['./library',
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.117.1
+		 * @version 1.119.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.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Button.js

@@ -21,7 +21,8 @@ sap.ui.define([
 	"sap/ui/core/LabelEnablement",
 	"sap/m/BadgeEnabler",
 	"sap/ui/core/InvisibleText",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/m/Image"
 ], function(
 	library,
 	Core,
@@ -38,7 +39,8 @@ sap.ui.define([
 	LabelEnablement,
 	BadgeEnabler,
 	InvisibleText,
-	Log
+	Log,
+	Image
 ) {
 	"use strict";
 
@@ -96,7 +98,7 @@ sap.ui.define([
 	 * @mixes sap.ui.core.ContextMenuSupport
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -571,7 +573,7 @@ sap.ui.define([
 
 	/**
 	 * Function is called when tap occurs on button.
-	 * @param {jQuery.Event} oEvent - the touch event.
+	 * @param {jQuery.Event} oEvent - the touch event
 	 * @private
 	 */
 	Button.prototype.ontap = function(oEvent, bFromTouchEnd) {
@@ -590,6 +592,9 @@ sap.ui.define([
 					this.focus();
 			}
 
+			/**
+			 * @deprecated As of version 1.20 the <code>tap</code> event has been replaced by the <code>press</code> event
+			 */
 			this.fireTap({/* no parameters */}); // (This event is deprecated, use the "press" event instead)
 			this.firePress({/* no parameters */ });
 		}
@@ -816,7 +821,7 @@ sap.ui.define([
 				// 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);
+			}, Image).addStyleClass("sapMBtnCustomIcon").setParent(this, null, true);
 		}
 
 		// add style classes to the object
@@ -851,7 +856,7 @@ sap.ui.define([
 				// do not use default tootip in icon as the button renders it's own tooltip
 				useIconTooltip: false
 
-			}, sap.m.Image).setParent(this, null, true);
+			}, Image).setParent(this, null, true);
 		}
 
 		// add style classes to the object

package/src/sap/m/Carousel.js

@@ -126,7 +126,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.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.117.1
+	 * @version 1.119.0
 	 *
 	 * @extends sap.ui.base.ManagedObject
 	 *

package/src/sap/m/CheckBox.js

@@ -90,7 +90,7 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.ui.core.IAccessKeySupport
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.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.117.1
+		 * @version 1.119.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/ColorPalettePopover.js

@@ -37,7 +37,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.117.1
+		 * @version 1.119.0
 		 *
 		 * @public
 		 * @since 1.54

package/src/sap/m/Column.js

@@ -6,18 +6,18 @@
 
 // Provides control sap.m.Column.
 sap.ui.define([
-	'./library',
-	'sap/ui/core/Element',
-	'sap/ui/core/Renderer',
-	'sap/ui/core/library',
-	'sap/ui/Device',
+	"./library",
+	"sap/ui/core/Core",
+	"sap/ui/core/Element",
+	"sap/ui/core/Renderer",
+	"sap/ui/core/library",
+	"sap/ui/Device",
 	"sap/ui/core/InvisibleText"
 ],
-	function(library, Element, Renderer, coreLibrary, Device, InvisibleText) {
+	function(library, Core, Element, Renderer, coreLibrary, Device, InvisibleText) {
 	"use strict";
 
 
-
 	// shortcut for sap.m.PopinDisplay
 	var PopinDisplay = library.PopinDisplay;
 
@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.117.1
+	 * @version 1.119.0
 	 *
 	 * @constructor
 	 * @public
@@ -267,7 +267,7 @@ sap.ui.define([
 	Column.prototype.onsapenter = Column.prototype.onsapspace;
 
 	Column.prototype.oncontextmenu = function (oEvent) {
-		var oMenu = this._getHeaderMenuInstance();
+		var oMenu = this.getHeaderMenuInstance();
 		if (oMenu) {
 			oMenu.openBy(this);
 			oEvent.preventDefault();
@@ -562,19 +562,6 @@ sap.ui.define([
 		}
 	};
 
-	// when the popover opens and later closed, the focus is lost
-	// 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 || this.getHeaderMenu())) {
-			var oColumnDomRef = this.getDomRef();
-			if (oColumnDomRef) {
-				return oColumnDomRef.firstChild;
-			}
-		}
-		return Element.prototype.getFocusDomRef.apply(this, arguments);
-	};
-
 	// returns the minScreenWidth property in pixel as integer
 	Column.prototype.getCalculatedMinScreenWidth = function() {
 		return parseInt(this._minWidth) || 0;
@@ -596,8 +583,8 @@ sap.ui.define([
 	 * @returns {sap.ui.core.IColumnHeaderMenu | undefined} The column header menu instance
 	 * @private
 	 */
-	Column.prototype._getHeaderMenuInstance = function () {
-		return sap.ui.getCore().byId(this.getHeaderMenu());
+	Column.prototype.getHeaderMenuInstance = function () {
+		return Core.byId(this.getHeaderMenu());
 	};
 
 	Column.prototype.setHeader = function (oControl) {
@@ -623,8 +610,8 @@ sap.ui.define([
 			return;
 		}
 
-		if (this.getTable().bActiveHeaders || this._getHeaderMenuInstance()) {
-			this.$("ah")[oEvent.getSource().getRequired() ? "addAriaDescribedBy" : "removeAriaDescribedBy"](InvisibleText.getStaticId("sap.m", "CONTROL_IN_COLUMN_REQUIRED"));
+		if (this.getTable().bActiveHeaders || this.getHeaderMenuInstance()) {
+			this.$()[oEvent.getSource().getRequired() ? "addAriaDescribedBy" : "removeAriaDescribedBy"](InvisibleText.getStaticId("sap.m", "CONTROL_IN_COLUMN_REQUIRED"));
 		}
 	};