@openui5/sap.ui.table 1.105.1 → 1.107.0

package/src/sap/ui/table/rowmodes/AutoRowMode.js

@@ -35,8 +35,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 * @version 1.107.0
 	 */
 	var AutoRowMode = RowMode.extend("sap.ui.table.rowmodes.AutoRowMode", /** @lends sap.ui.table.rowmodes.AutoRowMode.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/FixedRowMode.js

@@ -29,9 +29,8 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var FixedRowMode = RowMode.extend("sap.ui.table.rowmodes.FixedRowMode", /** @lends sap.ui.table.rowmodes.FixedRowMode.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/InteractiveRowMode.js

@@ -33,9 +33,8 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var InteractiveRowMode = RowMode.extend("sap.ui.table.rowmodes.InteractiveRowMode", /** @lends sap.ui.table.rowmodes.InteractiveRowMode.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/RowMode.js

@@ -34,8 +34,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
+	 * @version 1.107.0
 	 */
 	var RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
 		metadata: {

package/src/sap/ui/table/rowmodes/VariableRowMode.js

@@ -23,13 +23,12 @@ sap.ui.define([
 	 * @extends sap.ui.table.rowmodes.RowMode
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private
 	 * @experimental
 	 * @alias sap.ui.table.rowmodes.VariableRowMode
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var VariableRowMode = RowMode.extend("sap.ui.table.rowmodes.VariableRowMode", {
 		metadata: {

package/src/sap/ui/table/utils/TableUtils.js

@@ -203,7 +203,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private
@@ -481,37 +481,19 @@ sap.ui.define([
 		/**
 		 * Gets the message to be displayed if the table contains no columns or no data.
 		 *
-		 * @param oTable Instance of the table.
-		 * @returns {Control | string} The no data control or text message.
-		 */
-		getNoContentMessage: function(oTable) {
-			if (oTable._getVisibleColumns().length > 0) {
-				return oTable.getNoData();
-			} else {
-				return oTable.getAggregation("_noColumnsMessage");
-			}
-		},
-
-		/**
-		 * Gets the text to be displayed as the "no data text".
-		 * If a control is set for the <code>noData</code> aggregation, <code>null</code> is returned.
+		 * If the table has columns, it returns the content of the <code>noData</code> aggregation. If the aggregation is empty, it returns the
+		 * default "no data" text.
+		 * If the table does not have columns, it returns the content of the <code>_noColumnsMessage</code> aggregation. If the aggregation is
+		 * empty, it returns the default "no columns" text.
 		 *
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
-		 * @returns {string | null} The no data text.
+		 * @returns {sap.ui.core.Control | string} The no data control or text message.
 		 */
-		getNoDataText: function(oTable) {
-			var vNoData = oTable.getNoData();
-
-			if (TableUtils.getVisibleColumnCount(oTable) === 0 && !TableUtils.isA(vNoData, "sap.m.IllustratedMessage")) {
-				return TableUtils.getResourceText("TBL_NO_COLUMNS");
-			}
-
-			if (TableUtils.isA(vNoData, "sap.ui.core.Control")) {
-				return null;
-			} else if (typeof vNoData === "string") {
-				return vNoData;
+		getNoContentMessage: function(oTable) {
+			if (TableUtils.getVisibleColumnCount(oTable) > 0) {
+				return oTable.getNoData() || TableUtils.getResourceText("TBL_NO_DATA");
 			} else {
-				return TableUtils.getResourceText("TBL_NO_DATA");
+				return oTable.getAggregation("_noColumnsMessage") || TableUtils.getResourceText("TBL_NO_COLUMNS");
 			}
 		},
 
@@ -1329,13 +1311,13 @@ sap.ui.define([
 			var oTable = oRow.getTable();
 			var aCells = oRow.getCells();
 
-			if (bRowActionCells === true && this.hasRowActions(oTable)) {
+			if (bRowActionCells === true && TableUtils.hasRowActions(oTable)) {
 				aCells.push(oRow.getRowAction());
 			}
 
 			for (var i = 0; i < aCells.length; i++) {
 				var oCellContent = aCells[i].getDomRef();
-				var $Cell = this.getCell(oTable, oCellContent, true);
+				var $Cell = TableUtils.getCell(oTable, oCellContent, true);
 				var $InteractiveElements = TableUtils.getInteractiveElements($Cell);
 
 				if ($InteractiveElements) {

package/src/sap/ui/table/utils/_BindingUtils.js

@@ -14,7 +14,7 @@ sap.ui.define([], function() {
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Binding...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._BindingUtils
 	 * @private

package/src/sap/ui/table/utils/_ColumnUtils.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Column...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._ColumnUtils
 	 * @private
@@ -730,25 +730,18 @@ sap.ui.define([
 		 * <li>label</li>
 		 * </ul>
 		 *
-		 * @param {sap.ui.table.Table} oTable Instance of the table
-		 * @param {int} iColumnIndex The index of a column
+		 * @param {sap.ui.table.Column} oColumn Instance of the column
 		 * @returns {string} Returns the column header text
 		 */
-		getHeaderText: function(oTable, iColumnIndex) {
-			if (!oTable ||
-				iColumnIndex == null || iColumnIndex < 0) {
-				return null;
-			}
-
-			var aColumns = oTable.getColumns();
-			if (iColumnIndex >= aColumns.length) {
+		getHeaderText: function(oColumn) {
+			if (!oColumn) {
 				return null;
 			}
 
 			function getLabelText(oLabel) {
 				return oLabel && oLabel.getText && oLabel.getText() || "";
 			}
-			var oColumn = aColumns[iColumnIndex];
+
 			var sText = oColumn.getName();
 
 			if (!sText) {
@@ -765,7 +758,40 @@ sap.ui.define([
 			if (!sText) {
 				sText = getLabelText(oColumn.getLabel());
 			}
+
 			return sText;
+		},
+
+		/**
+		 * Returns one of the following starting with highest priority:
+		 * <ul>
+		 * <li>Last label of the column with a span equal to 1, if the column has multiLabels</li>
+		 * <li>label control</li>
+		 * </ul>
+		 *
+		 * @param {sap.ui.table.Column} oColumn Instance of the column
+		 * @returns {sap.ui.core.Control} Returns the column header label
+		 */
+		getHeaderLabel: function (oColumn) {
+			if (!oColumn) {
+				return null;
+			}
+
+			var oLabel;
+			var aMultiLabels = oColumn.getMultiLabels();
+
+			for (var i = aMultiLabels.length - 1; i >= 0; i--) {
+				if (ColumnUtils.getHeaderSpan(oColumn, i) === 1) {
+					oLabel = aMultiLabels[i];
+					break;
+				}
+			}
+
+			if (!oLabel) {
+				oLabel = oColumn.getLabel();
+			}
+
+			return oLabel;
 		}
 	};
 

package/src/sap/ui/table/utils/_GroupingUtils.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Grouping...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._GroupingUtils
 	 * @private

package/src/sap/ui/table/utils/_HookUtils.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/base/DataType"], function(DataType) {
 	 * - There is no concept for public or protected hooks. Never expose a hook directly, only indirectly as can be seen in the examples.
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

package/src/sap/ui/table/utils/_MenuUtils.js

@@ -13,9 +13,6 @@ sap.ui.define([
 ], function(Device, Menu, MenuItem, Popup) {
 	"use strict";
 
-	// Table uses z-indices, ensure that popups starts their z-indices at least with 20.
-	Popup.setInitialZIndex(10);
-
 	function onCellFilterSelect(oColumn, oRow) {
 		// "this" is the table instance.
 		var oRowContext = oRow.getRowBindingContext();
@@ -42,7 +39,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Menu...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private
@@ -91,28 +88,29 @@ sap.ui.define([
 			var bExecuteDefault = true;
 
 			if (oCellInfo.isOfType(MenuUtils.TableUtils.CELLTYPE.COLUMNHEADER)) {
-				var bCellHasMenuButton = oCell.querySelector(".sapUiTableColDropDown") !== null;
+				var oColumn = oTable.getColumns()[iColumnIndex];
+				var oColumnHeaderMenu = oColumn.getHeaderMenuInstance();
+
+				if (oColumnHeaderMenu) {
+					oColumn._openHeaderMenu(oCell);
+					return true;
+				} else {
+					var bCellHasMenuButton = oCell.querySelector(".sapUiTableColDropDown") !== null;
+
+					if (!Device.system.desktop && !bCellHasMenuButton) {
+						return MenuUtils._applyColumnHeaderCellMenu(oTable, oCell);
+					}
 
-				if (Device.system.desktop || bCellHasMenuButton) {
 					MenuUtils._removeColumnHeaderCellMenu(oTable);
+					bExecuteDefault = oTable.fireColumnSelect({
+						column: oColumn
+					});
 
-					var oColumn = oTable.getColumns()[iColumnIndex];
-					var oPopover = oColumn.getColumnHeaderMenu();
-					if (oPopover) {
-						oPopover.openBy(oColumn);
+					if (bExecuteDefault) {
+						return MenuUtils._openColumnContextMenu(oTable, oCell);
 					} else {
-						bExecuteDefault = oTable.fireColumnSelect({
-							column: oColumn
-						});
-
-						if (bExecuteDefault) {
-							return MenuUtils._openColumnContextMenu(oTable, oCell);
-						} else {
-							return true; // We do not know whether the event handler opens a context menu or not, so we just assume it is done.
-						}
+						return true; // We do not know whether the event handler opens a context menu or not, so we just assume it is done.
 					}
-				} else {
-					return MenuUtils._applyColumnHeaderCellMenu(oTable, oCell);
 				}
 
 			} else if (oCellInfo.isOfType(MenuUtils.TableUtils.CELLTYPE.ANYCONTENTCELL)) {