@openui5/sap.m 1.108.2 → 1.110.0

package/src/sap/m/p13n/modules/UIManager.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.
  */
 
@@ -28,14 +28,14 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @private
 	 *
 	 * @since 1.104
 	 * @alias sap.m.p13n.modules.UIManager
 	 */
-	var UIManager = BaseObject.extend("sap.m.p13n.UIManager", {
+	var UIManager = BaseObject.extend("sap.m.p13n.modules.UIManager", {
 		constructor: function(oAdaptationProvider) {
 
 			if (oUIManager) {
@@ -54,10 +54,12 @@ sap.ui.define([
 	 * @param {string|string[]} vPanelKeys The affected panels that should be added to the <code>sap.m.p13n.Popup</code>
 	 * @param {object} mSettings The settings object for the personalization
 	 * @param {string} [mSettings.title] The title for the <code>sap.m.p13n.Popup</code> control
-	 * @param {object} [mSettings.source] The source contro to be used by the <code>sap.m.p13n.Popup</code> control (only necessary in case the mode is set to <code>ResponsivePopover</code>)
-	 * @param {object} [mSettings.mode] The mode to be used by the <code>sap.m.p13n.Popup</code> control
-	 * @param {object} [mSettings.contentHeight] Height configuration for the related popup container
-	 * @param {object} [mSettings.contentWidth] Width configuration for the related popup container
+	 * @param {sap.ui.core.Control} [mSettings.source] The source contro to be used by the <code>sap.m.p13n.Popup</code> control (only necessary in case the mode is set to <code>ResponsivePopover</code>)
+	 * @param {sap.m.P13nPopupMode} [mSettings.mode] The mode to be used by the <code>sap.m.p13n.Popup</code> control
+	 * @param {sap.ui.core.CSSSize} [mSettings.contentHeight] Height configuration for the related popup container
+	 * @param {sap.ui.core.CSSSize} [mSettings.contentWidth] Width configuration for the related popup container
+	 * @param {boolean} [mSettings.showReset] Determines the visibility of the <code>Reset</code> button
+	 * @param {function} [mSettings.close] Event handler once the Popup has been closed
 	 *
 	 * @returns {Promise} Promise resolving in the <code>sap.m.p13n.Popup</code> instance.
 	 */
@@ -76,7 +78,7 @@ sap.ui.define([
 
 					//if there is no title provided and only one panel created, use it's title as the Popup title
 					var sTitle;
-					if (!mSettings.title && aPanelKeys.length === 1) {
+					if (!mSettings.title && aPanelKeys.length === 1 && aInitializedPanels.length > 0) {
 						sTitle = aInitializedPanels[0].getTitle();
 					} else {
 						sTitle = mSettings.title || oResourceBundle.getText("p13n.VIEW_SETTINGS");
@@ -89,18 +91,31 @@ sap.ui.define([
 						warningText: mSettings.warningText || oResourceBundle.getText("p13n.RESET_WARNING_TEXT"),
 						title: sTitle,
 						close: function(oEvt){
+
+							if (mSettings.close instanceof Function) {
+								mSettings.close(oEvt);
+							}
+
 							var sReason = oEvt.getParameter("reason");
 							if (sReason == "Ok") {
 								that.oAdaptationProvider.handleP13n(oControl, aPanelKeys);
 							}
-							oP13nContainer.removeAllPanels();//TODO
-							that.setActiveP13n(oControl, null);
+							var aPanels = oP13nContainer.getPanels();
 
-							oP13nContainer.destroy();
+							aPanels.forEach(function(oPanel){
+								if (oPanel.keepAlive instanceof Function && oPanel.keepAlive()){
+									oP13nContainer.removePanel(oPanel);
+								}
+							});
+
+							that.setActiveP13n(oControl, null);
+							oP13nContainer._oPopup.attachAfterClose(function(){
+								oP13nContainer.destroy();
+							});
 						},
-						reset: function(){
+						reset: mSettings.showReset !== false ? function(){
 							that.oAdaptationProvider.reset(oControl, aPanelKeys);
-						}
+						} : undefined
 					});
 
 					aInitializedPanels.forEach(function(oPanel, iIndex){
@@ -216,7 +231,7 @@ sap.ui.define([
 	 * @param {sap.m.AdaptationProvider} oAdaptationProvider Object implementing the <code>sap.m.AdaptationProvider</code> interface to provide personalization capabilites.
 	 */
 	UIManager._checkValidInterface = function(oAdaptationProvider) {
-		if (!oAdaptationProvider || !oAdaptationProvider.isA("sap.m.p13n.AdaptationProvider")){
+		if (!oAdaptationProvider || !oAdaptationProvider.isA("sap.m.p13n.modules.AdaptationProvider")){
 			throw Error("The UIManager singleton must not be accessed without an AdaptationProvider interface!");
 		}
 	};

package/src/sap/m/p13n/modules/xConfigAPI.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([
@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Element} oControl The according element which should be checked
 	 * @param {object} oModificationPayload An object providing a modification handler specific payload
-	 * @param {object} oModificationPayload.key The affected property name
+	 * @param {object} oModificationPayload.key The affected metadata property key
 	 * @param {object} oModificationPayload.controlMeta Object describing which config is affected
 	 * @param {object} oModificationPayload.controlMeta.aggregation The affected aggregation name (such as <code>columns</code> or <code>filterItems</code>)
 	 * @param {object} oModificationPayload.property The affected property name (such as <code>width</code> or <code>lable</code>)
@@ -60,10 +60,7 @@ sap.ui.define([
 						return merge({}, JSON.parse(sConfig.replace(/\\/g, '')));
 					});
 				}
-				return {
-					aggregations: {},
-					properties: {}
-				};
+				return {};
 			})
 			.then(function(oExistingConfig) {
 
@@ -183,7 +180,7 @@ sap.ui.define([
 	 */
 	xConfigAPI.createAggregationConfig = function(oControl, oModificationPayload, oExistingConfig) {
 
-		var sPropertyInfoKey = oModificationPayload.key;
+		var sPropertyInfoKey = oModificationPayload.key || oModificationPayload.name;
 		var mControlMeta = oModificationPayload.controlMeta;
 
 		var sAffectedProperty = oModificationPayload.property;
@@ -191,10 +188,9 @@ sap.ui.define([
 		var vValue = oModificationPayload.value;
 		var oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
 		var sAffectedAggregation = mControlMeta.aggregation;
-		var sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().key;
-		var oConfig = oExistingConfig || {
-			aggregations: {}
-		};
+		var sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
+		var oConfig = oExistingConfig || {};
+		oConfig.aggregations = {};
 
 		if (!oConfig.aggregations.hasOwnProperty(sAggregationName)) {
 			if (oControlMetadata.hasAggregation(sAggregationName)) {
@@ -217,8 +213,15 @@ sap.ui.define([
 				case "remove":
 				case "add":
 				default:
-					oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.value;
-					oConfig.aggregations[sAggregationName][sPropertyInfoKey]["position"] = vValue.index;
+					/*TODO*/
+					if (vValue.hasOwnProperty("value")) {
+						oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.value;
+						oConfig.aggregations[sAggregationName][sPropertyInfoKey]["position"] = vValue.index;
+					} else {
+						oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue;
+					}
+
+					/*TODO*/
 					break;
 			}
 
@@ -258,9 +261,8 @@ sap.ui.define([
 		var vValue = oModificationPayload.value;
 		//var oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
 		var sAffectedProperty = oModificationPayload.property;
-		var oConfig = oExistingConfig || {
-			properties: {}
-		};
+		var oConfig = oExistingConfig || {};
+		oConfig.properties = {};
 
 		if (!oConfig.properties.hasOwnProperty(sAffectedProperty)) {
 			oConfig.properties[sAffectedProperty] = [];

package/src/sap/m/plugins/CellSelector.js

@@ -1,15 +1,15 @@
 /*!
  * 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([
 	"./PluginBase",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/core/Core",
-	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/Element",
 	"sap/base/Log"
-], function (PluginBase, KeyCodes, Core, jQuery, Log) {
+], function (PluginBase, KeyCodes, Core, Element, Log) {
 	"use strict";
 
 	var SELECTION_DIRECTION = {
@@ -53,7 +53,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.m.plugins.PluginBase
 	 * @class
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @author SAP SE
 	 *
 	 * @private
@@ -62,7 +62,22 @@ sap.ui.define([
 	var CellSelector = PluginBase.extend("sap.m.plugins.CellSelector", {
 		metadata: {
 			library: "sap.m",
-			properties: {},
+			properties: {
+				/**
+				 * For the {@link sap.ui.table.Table} control, defines the number of row contexts that needs to be retrived from the binding
+				 * when the range selection (e.g. enhancing the cell selection block to cover all rows of a column) is triggered by the user.
+				 * This helps to make the contexts already available for the user actions after the cell selection (e.g. copy to clipboard).
+				 * This property accepts positive integer values.
+				 * <b>Note:</b> To avoid performance problems, the <code>rangeLimit</code> should only be set higher than the default value of 200 in the following cases:
+				 * <ul>
+				 *     <li>With client-side models</li>
+				 *     <li>With server-side models if they are used in client mode</li>
+				 *     <li>If the entity set is small</li>
+				 * </ul>
+				 * In other cases, it is recommended to set the <code>rangeLimit</code> to at least double the value of the {@link sap.ui.table.Table#getThreshold threshold} property.
+				 */
+				rangeLimit: {type: "int", group: "Behavior", defaultValue: 200}
+			},
 			events: {}
 		}
 	});
@@ -114,34 +129,48 @@ sap.ui.define([
 	};
 
 	/**
-	 * Retrieve the cells for the current selection.
+	 * Returns the cell selection range.
+	 * The value <code>Infinity</code> in <code>rowIndex</code> meant for until the limit is reached.
 	 *
 	 * Note: This method is subject to change.
-	 * @returns {Object} contains the selected cells in each selected row
+	 * @returns {{from: {rowIndex: int, colIndex: int}, to: {rowIndex: int, colIndex: int}}  The range of the selection
 	 * @private
-	 * @experimental Since 1.104
+	 * @experimental Since 1.110
+	 * @ui5-restricted sap.m.plugins.CopyProvider
 	 */
-	CellSelector.prototype.getSelectedCells = function () {
+	CellSelector.prototype.getSelectionRange = function () {
 		if (!this._bSelecting) {
-			return {};
+			return null;
 		}
-		var oNormalizedBounds = getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget);
-
-		var oSelection = {};
-		for (var iRow = oNormalizedBounds.from.rowIndex; iRow < oNormalizedBounds.to.rowIndex; iRow++) {
-			var oRowContext = this.getConfig("contextByIndex", this.getControl(), iRow), aColumns = [];
-			for (var iCol = oNormalizedBounds.from.colIndex; iCol < oNormalizedBounds.to.colIndex; iCol++) {
-				var oColumn = this.getConfig("columnByIndex", this.getControl(), iCol);
-				if (oColumn) {
-					aColumns.push(iCol);
-				}
-			}
-			oSelection[iRow] = {
-				rowContext: oRowContext,
-				columnIndices: aColumns
-			};
+
+		var mSelectionRange = getNormalizedBounds(this._oSession.mSource, this._oSession.mTarget);
+		if (isNaN(mSelectionRange.from.rowIndex) || isNaN(mSelectionRange.to.rowIndex)) {
+			return null;
+		}
+
+		var iMaxColumnIndex = this.getConfig("getVisibleColumns", this.getControl()).length - 1;
+		mSelectionRange.from.colIndex = Math.max(mSelectionRange.from.colIndex, 0);
+		mSelectionRange.to.colIndex = Math.min(mSelectionRange.to.colIndex, iMaxColumnIndex);
+		mSelectionRange.from.rowIndex = Math.max(mSelectionRange.from.rowIndex, 0);
+		return mSelectionRange;
+	};
+
+	/**
+	 * Returns the row binding context of the current selection.
+	 *
+	 * Note: This method is subject to change.
+	 * @returns {sap.ui.model.Context[]} The binding context of selected rows
+	 * @private
+	 * @experimental Since 1.110
+	 * @ui5-restricted sap.m.plugins.CopyProvider
+	 */
+	CellSelector.prototype.getSelectedRowContexts = function () {
+		var mSelectionRange = this.getSelectionRange();
+		if (!mSelectionRange) {
+			return [];
 		}
-		return oSelection;
+
+		return this.getConfig("rowContexts", this.getControl(), mSelectionRange.from.rowIndex, mSelectionRange.to.rowIndex, this.getRangeLimit());
 	};
 
 	CellSelector.prototype.onsapspace = function (oEvent) {
@@ -264,19 +293,12 @@ sap.ui.define([
 			// CTRL+SHIFT+A: Clear Selection
 			if (isKeyCombination(oEvent, KeyCodes.A, true, true)) {
 				this.clearSelection();
+				oEvent.preventDefault();
+				oEvent.setMarked();
 			}
-			oEvent.preventDefault();
-			oEvent.setMarked();
 		}
 	};
 
-	CellSelector.prototype.onkeyup = function (oEvent) {
-		if (!this._bSelecting) {
-			return;
-		}
-		oEvent.setMarked();
-	};
-
 	// Mouse Navigation
 
 	CellSelector.prototype.ontouchstart = function (oEvent) {
@@ -552,6 +574,10 @@ sap.ui.define([
 			return;
 		}
 
+		if (mBounds.to.rowIndex == Infinity) {
+			this.getConfig("loadContexts", this.getControl(), mBounds.from.rowIndex, this.getRangeLimit());
+		}
+
 		var oBorderOptions = this._getBorderOptions(mBounds, mDrawableBounds);
 		this._oSession.aCells = oSelection.cells;
 		this._drawSelection(mDrawableBounds, oBorderOptions);
@@ -894,6 +920,16 @@ sap.ui.define([
 				});
 				oSelectionPlugin.detachEvent(sEvent, oPlugin.clearSelection, oPlugin);
 			},
+			/**
+			 * Get visible columns of the table.
+			 * @param {sap.ui.table.Table} oTable table instance
+			 * @returns {sap.ui.table.Column[]} array of visible columns
+			 */
+			getVisibleColumns: function (oTable) {
+				return oTable.getColumns().filter(function (oColumn) {
+					return oColumn.getDomRef();
+				});
+			},
 			/**
 			 * Checks if the selection is enabled for the control.
 			 * @param {sap.ui.core.Control} oControl control instance
@@ -913,7 +949,7 @@ sap.ui.define([
 			getCellRef: function (oTable, mPosition) {
 				var oRow = this._getRowByIndex(oTable, mPosition.rowIndex);
 				if (oRow) {
-					var oColumn = this._getColumns(oTable)[mPosition.colIndex];
+					var oColumn = this.getVisibleColumns(oTable)[mPosition.colIndex];
 					var oCell = oColumn && oRow.getCells()[mPosition.colIndex];
 					if (oCell) {
 						return oCell.$().closest(this.selectableCells)[0];
@@ -941,7 +977,7 @@ sap.ui.define([
 				var aRows = oTable.getRows();
 				return {
 					from: {rowIndex: aRows[0].getIndex(), colIndex: 0},
-					to: {rowIndex: aRows[aRows.length - 1].getIndex(), colIndex: this._getColumns(oTable).length - 1}
+					to: {rowIndex: aRows[aRows.length - 1].getIndex(), colIndex: this.getVisibleColumns(oTable).length - 1}
 				};
 			},
 			/**
@@ -989,19 +1025,19 @@ sap.ui.define([
 				mBounds.from.colIndex = Math.max(mBounds.from.colIndex, 0);
 
 				mBounds.to.rowIndex = Math.min(mBounds.to.rowIndex, iBindingLength);
-				mBounds.to.colIndex = Math.min(mBounds.to.colIndex, this._getColumns(oTable).length - 1);
+				mBounds.to.colIndex = Math.min(mBounds.to.colIndex, this.getVisibleColumns(oTable).length - 1);
 
 				var aCells = [];
 
 				// Replace MIN/MAX with according number for focus object
 				if (oOptions && oOptions.info) {
 					oOptions.info.focus.rowIndex = Math.min(Math.max(oOptions.info.focus.rowIndex, 0), iBindingLength);
-					oOptions.info.focus.colIndex = Math.min(Math.max(oOptions.info.focus.colIndex, 0), this._getColumns(oTable).length - 1);
+					oOptions.info.focus.colIndex = Math.min(Math.max(oOptions.info.focus.colIndex, 0), this.getVisibleColumns(oTable).length - 1);
 					this._focusCell(oTable, oOptions.info.focus, oOptions.info.direction);
 				}
 
 				// If table is in Single Selection Mode, only select the row with focus in it
-				if (mBounds.from.colIndex === 0 && mBounds.to.colIndex === (this._getColumns(oTable).length - 1) && oTable.getSelectionMode() == "Single") {
+				if (mBounds.from.colIndex === 0 && mBounds.to.colIndex === (this.getVisibleColumns(oTable).length - 1) && oTable.getSelectionMode() == "Single") {
 					mBounds.from.rowIndex = mSelectionBounds.from.rowIndex = oOptions.info.focus.rowIndex;
 					mBounds.to.rowIndex = mSelectionBounds.to.rowIndex = oOptions.info.focus.rowIndex;
 				}
@@ -1024,7 +1060,7 @@ sap.ui.define([
 			 * @returns {int} row index
 			 */
 			rowIndex: function (oTable, oCellDomRef) {
-				return jQuery(oCellDomRef).control(0, true).getIndex();
+				return Element.closestTo(oCellDomRef, true).getIndex();
 			},
 			/**
 			 * Retrieves the column index for the given cell's DOM reference.
@@ -1033,13 +1069,45 @@ sap.ui.define([
 			 * @returns {int} column index
 			 */
 			colIndex: function (oTable, oCellDomRef) {
-				return this._getColumns(oTable).indexOf(Core.byId(oCellDomRef.getAttribute("data-sap-ui-colid")));
+				return this.getVisibleColumns(oTable).indexOf(Core.byId(oCellDomRef.getAttribute("data-sap-ui-colid")));
 			},
-			contextByIndex: function(oTable, iRowIndex) {
-				return oTable.getContextByIndex(iRowIndex);
+			/**
+			 * Loads contexts according to the provided parameters without changing the binding's state.
+			 *
+			 * @param {sap.ui.table.Table} oTable The Table instance
+			 * @param {int} iStartIndex The index where to start the retrieval of contexts
+			 * @param {int} iLength The number of contexts to retrieve beginning from the start index.
+			 */
+			loadContexts: function(oTable, iStartIndex, iLength) {
+				var oBinding = oTable.getBinding("rows");
+				if (!oBinding || oBinding.isA("sap.ui.model.ClientListBinding")) {
+					return;
+				}
+
+				oBinding.getContexts(Math.max(0, iStartIndex), Math.max(1, iLength), 0, true);
+			},
+			/**
+			 * Retrieves the row contexts of the table according to the specified parameters.
+			 * @param {sap.ui.table.Table} oTable The table instance
+			 * @param {int} iFromIndex The start index
+			 * @param {int} iToIndex The end index
+			 * @param {int} iLimit The range limit
+			 * @returns {sap.ui.model.Context[]} A portion of the row binding contexts
+			 */
+			rowContexts: function(oTable, iFromIndex, iToIndex, iLimit) {
+				if (iToIndex == Infinity) {
+					var iMaxIndex = oTable.getBinding("rows").getAllCurrentContexts().length - 1;
+					iToIndex = Math.min(iToIndex, iFromIndex + iLimit - 1, iMaxIndex);
+				}
+
+				var aContexts = [];
+				for (var i = iFromIndex; i <= iToIndex; i++) {
+					aContexts.push(oTable.getContextByIndex(i));
+				}
+				return aContexts;
 			},
 			columnByIndex: function(oTable, iColIndex) {
-				var oColumn = this._getColumns(oTable)[iColIndex];
+				var oColumn = this.getVisibleColumns(oTable)[iColIndex];
 				if (!oColumn.getVisible()) {
 					return;
 				}
@@ -1047,7 +1115,7 @@ sap.ui.define([
 			},
 			isNavigatableCell: function (oTable, mPosition) {
 				if ((mPosition.rowIndex < 0 || mPosition.rowIndex >= oTable.getBinding("rows").getLength()
-					|| mPosition.colIndex < 0 || mPosition.colIndex >= this._getColumns(oTable).length)
+					|| mPosition.colIndex < 0 || mPosition.colIndex >= this.getVisibleColumns(oTable).length)
 					&& !(mPosition.rowIndex == -Infinity || mPosition.rowIndex == Infinity
 					|| mPosition.colIndex == -Infinity || mPosition.colIndex == Infinity)) {
 					return false;
@@ -1093,16 +1161,6 @@ sap.ui.define([
 				}
 				oCellRef &&	oCellRef.focus();
 			},
-			/**
-			 * Get visible columns of the table.
-			 * @param {sap.ui.table.Table} oTable table instance
-			 * @returns {sap.ui.table.Column[]} array of visible columns
-			 */
-			_getColumns: function (oTable) {
-				return oTable.getColumns().filter(function (oColumn) {
-					return oColumn.getDomRef();
-				});
-			},
 			/**
 			 * Retrieve a row by its index.
 			 * @param {sap.ui.table.Table} oTable table instance

package/src/sap/m/plugins/ColumnResizer.js

@@ -1,22 +1,23 @@
 /*!
  * 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([
 	"./PluginBase",
 	"sap/ui/core/Core",
+	"sap/ui/core/Element",
 	"sap/ui/core/InvisibleText",
 	"sap/ui/Device",
 	"sap/m/ColumnPopoverActionItem",
 	"sap/m/table/columnmenu/QuickAction",
 	"sap/m/Button",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/dom/jquery/control", // jQuery Plugin "control"
 	"sap/ui/dom/jquery/Aria" // jQuery Plugin "aria"
 ], function(PluginBase,
 	Core,
+	Element,
 	InvisibleText,
 	Device,
 	ColumnPopoverActionItem,
@@ -39,7 +40,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @public
 	 * @since 1.91
@@ -124,7 +125,7 @@ sap.ui.define([
 	 */
 	ColumnResizer.prototype._updateAriaDescribedBy = function(sAction) {
 		this._aResizables.forEach(function(oResizable) {
-			var oResizableControl = jQuery(oResizable).control(0, true);
+			var oResizableControl = Element.closestTo(oResizable, true);
 			var oFocusDomRef = oResizableControl && oResizableControl.getFocusDomRef();
 			jQuery(oFocusDomRef)[sAction + "AriaDescribedBy"](InvisibleText.getStaticId("sap.m", "COLUMNRESIZER_RESIZABLE"));
 		});
@@ -346,14 +347,14 @@ sap.ui.define([
 	 */
 	ColumnResizer.prototype._startResizeSession = function(iIndex) {
 		oSession.$CurrentColumn = jQuery(this._aResizables[iIndex]);
-		oSession.oCurrentColumn = oSession.$CurrentColumn.control(0, true);
+		oSession.oCurrentColumn = Element.closestTo(oSession.$CurrentColumn[0], true);
 		oSession.fCurrentColumnWidth = oSession.$CurrentColumn.width();
 		oSession.iMaxDecrease = this._getColumnMinWidth(oSession.oCurrentColumn) - oSession.fCurrentColumnWidth;
 		oSession.iEmptySpace = this.getConfig("emptySpace", this.getControl());
 
 		if (oSession.iEmptySpace != -1) {
 			oSession.$NextColumn = jQuery(this._aResizables[iIndex + 1]);
-			oSession.oNextColumn = oSession.$NextColumn.control(0, true);
+			oSession.oNextColumn = Element.closestTo(oSession.$NextColumn[0], true);
 			oSession.fNextColumnWidth = oSession.$NextColumn.width() || 0;
 			oSession.iMaxIncrease = oSession.iEmptySpace + oSession.fNextColumnWidth - this._getColumnMinWidth(oSession.oNextColumn);
 		} else {
@@ -396,7 +397,7 @@ sap.ui.define([
 		// when any column is resized, then make all visible columns have fixed width
 		this.getConfig("fixAutoWidthColumns") && this._aResizables.forEach(function(oResizable) {
 			var $Resizable = jQuery(oResizable),
-				oColumn = $Resizable.control(0, true),
+				oColumn = Element.closestTo(oResizable, true),
 				sWidth = oColumn.getWidth();
 
 			if (sWidth && sWidth.toLowerCase() != "auto") {
@@ -506,9 +507,8 @@ sap.ui.define([
 		}
 
 		return new QuickAction({
-			label: Core.getLibraryResourceBundle("sap.m").getText("table.COLUMN_MENU_RESIZE"),
 			content: new Button({
-				icon: "sap-icon://resize-horizontal",
+				text: Core.getLibraryResourceBundle("sap.m").getText("table.COLUMNMENU_RESIZE"),
 				press: function() {
 					oColumnMenu.close();
 					this.startResizing(oColumn.getDomRef());