@openui5/sap.ui.table 1.105.1 → 1.107.0

package/src/sap/ui/table/Column.js

@@ -8,7 +8,9 @@
 sap.ui.define([
 	"./ColumnMenu",
 	"./utils/TableUtils",
+	"./menus/ColumnHeaderMenuAdapter",
 	"./library",
+	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/Popup",
 	"sap/ui/core/library",
@@ -24,7 +26,9 @@ sap.ui.define([
 ], function(
 	ColumnMenu,
 	TableUtils,
+	ColumnHeaderMenuAdapter,
 	library,
+	Core,
 	Element,
 	Popup,
 	coreLibrary,
@@ -68,12 +72,11 @@ sap.ui.define([
 	 * @class
 	 * The column allows you to define column specific properties that will be applied when rendering the table.
 	 * @extends sap.ui.core.Element
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.table.Column
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Column = Element.extend("sap.ui.table.Column", /** @lends sap.ui.table.Column.prototype */ { metadata : {
 
@@ -323,11 +326,11 @@ sap.ui.define([
 		},
 		associations: {
 			/**
-			 * Provides a menu that is used by the column and replaces the menu aggregation when set.
-			 * The given menu has to follow the same pattern as the <code>sap.ui.core.IColumnHeaderMenu</code> interface.
-			 * @since 1.98.0
+			 * The menu that can be opened by the header element of this column.
+			 *
+			 * @since 1.104
 			 */
-			columnHeaderMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
+			headerMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
 		},
 		events : {
 			/**
@@ -386,6 +389,7 @@ sap.ui.define([
 	 */
 	Column.prototype.exit = function() {
 		this._destroyTemplateClones();
+		ColumnHeaderMenuAdapter.unlink(this);
 	};
 
 	/**
@@ -807,6 +811,31 @@ sap.ui.define([
 		}
 	};
 
+	Column.prototype._openHeaderMenu = function(oDomRef) {
+		var oHeaderMenu = this.getHeaderMenuInstance();
+		if (oHeaderMenu) {
+			ColumnHeaderMenuAdapter.activateFor(this).then(function() {
+				oHeaderMenu.openBy(oDomRef);
+			});
+		}
+	};
+
+	Column.prototype._isMenuOpen = function() {
+		var oHeaderMenu = this.getHeaderMenuInstance();
+		if (!oHeaderMenu) {
+			return false;
+		}
+		return oHeaderMenu.isOpen();
+	};
+
+	Column.prototype._setGrouped = function(bGrouped) {
+		var oTable = this._getTable();
+		oTable.setGroupBy(bGrouped ? this : null);
+	};
+
+	Column.prototype._isAggregatableByMenu = function() {
+		return false;
+	};
 
 	/**
 	 * Toggles the sort order of the column.
@@ -814,7 +843,6 @@ sap.ui.define([
 	 * @public
 	 * @deprecated Since version 1.5.1.
 	 * Please use the function "sap.ui.Table.prototype.sort".
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Column.prototype.toggleSort = function() {
 		// by default we sort ascending / only if already is sorted ascending then we toggle
@@ -829,7 +857,6 @@ sap.ui.define([
 	 * @returns {this} Reference to <code>this</code> in order to allow method chaining
 	 * @public
 	 * @deprecated Since version 1.5.1. Please use the function "sap.ui.Table.prototype.sort".
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Column.prototype.sort = function(bDescending, bAdd) {
 		var oTable = this.getParent();
@@ -847,54 +874,70 @@ sap.ui.define([
 			});
 
 			if (bExecuteDefault) {
-				var aSortedCols = oTable.getSortedColumns();
-				var aColumns = oTable.getColumns();
-
-				// reset the sorting status of all columns which are not sorted anymore
-				for (var i = 0, l = aColumns.length; i < l; i++) {
-					if (aSortedCols.indexOf(aColumns[i]) < 0) {
-						// column is not sorted anymore -> reset default and remove sorter
-						aColumns[i].setProperty("sorted", false, true);
-						aColumns[i].setProperty("sortOrder", SortOrder.Ascending, true);
-						aColumns[i]._updateIcons(true);
-						delete _private(aColumns[i]).oSorter;
-					}
-				}
-
 				// update properties of current column
 				this.setProperty("sorted", true, true);
 				this.setProperty("sortOrder", sNewSortOrder, true);
 				_private(this).oSorter = new Sorter(this.getSortProperty(), this.getSortOrder() === SortOrder.Descending);
 
-				// add sorters of all sorted columns to one sorter-array and update sort icon rendering for sorted columns
-				var aSorters = [];
-				for (var i = 0, l = aSortedCols.length; i < l; i++) {
-					aSortedCols[i]._updateIcons(true);
-					aSorters.push(_private(aSortedCols[i]).oSorter);
-				}
+				this._applySorters(sNewSortOrder, bAdd);
+			}
+		}
+		return this;
+	};
 
-				oTable._resetColumnHeaderHeights();
-				oTable._updateRowHeights(oTable._collectRowHeights(true), true);
-
-				var oBinding = oTable.getBinding();
-				if (oBinding) {
-					// For the AnalyticalTable with an AnalyticalColumn.
-					if (this._updateTableAnalyticalInfo) {
-						// The analytical info must be updated before sorting via the binding. The request will still be correct, but the binding
-						// will create its internal data structure based on the analytical info. We also do not need to get the contexts right
-						// now (therefore "true" is passed"), this will be done later in refreshRows.
-						this._updateTableAnalyticalInfo(true);
-					}
+	Column.prototype._unsort = function() {
+		var oTable = this.getParent();
+		if (oTable) {
+			// add current column to list of sorted columns
+			oTable._removeSortedColumn(this);
 
-					// sort the binding
-					oBinding.sort(aSorters);
+			this._applySorters();
+		}
+		return this;
+	};
 
-				} else {
-					Log.warning("Sorting not performed because no binding present", this);
-				}
+	Column.prototype._applySorters = function(sNewSortOrder, bAdd) {
+		var oTable = this.getParent();
+		var aSortedCols = oTable.getSortedColumns();
+		var aColumns = oTable.getColumns();
+
+		// reset the sorting status of all columns which are not sorted anymore
+		for (var i = 0, l = aColumns.length; i < l; i++) {
+			if (aSortedCols.indexOf(aColumns[i]) < 0) {
+				// column is not sorted anymore -> reset default and remove sorter
+				aColumns[i].setProperty("sorted", false, true);
+				aColumns[i].setProperty("sortOrder", SortOrder.Ascending, true);
+				aColumns[i]._updateIcons(true);
+				delete _private(aColumns[i]).oSorter;
 			}
 		}
-		return this;
+
+		// add sorters of all sorted columns to one sorter-array and update sort icon rendering for sorted columns
+		var aSorters = [];
+		for (var i = 0, l = aSortedCols.length; i < l; i++) {
+			aSortedCols[i]._updateIcons(true);
+			aSorters.push(_private(aSortedCols[i]).oSorter);
+		}
+
+		oTable._resetColumnHeaderHeights();
+		oTable._updateRowHeights(oTable._collectRowHeights(true), true);
+
+		var oBinding = oTable.getBinding();
+		if (oBinding) {
+			// For the AnalyticalTable with an AnalyticalColumn.
+			if (this._updateTableAnalyticalInfo) {
+				// The analytical info must be updated before sorting via the binding. The request will still be correct, but the binding
+				// will create its internal data structure based on the analytical info. We also do not need to get the contexts right
+				// now (therefore "true" is passed"), this will be done later in refreshRows.
+				this._updateTableAnalyticalInfo(true);
+			}
+
+			// sort the binding
+			oBinding.sort(aSorters);
+
+		} else {
+			Log.warning("Sorting not performed because no binding present", this);
+		}
 	};
 
 	Column.prototype._updateIcons = function(bSkipUpdateRowHeights) {
@@ -925,6 +968,15 @@ sap.ui.define([
 		this._updateIcons();
 	};
 
+	Column.prototype._getFilterState = function() {
+		try {
+			this._getFilter();
+			return ValueState.None;
+		} catch (e) {
+			return ValueState.Error;
+		}
+	};
+
 	Column.prototype._getFilter = function() {
 
 		var oFilter,
@@ -1316,13 +1368,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the <code>sap.ui.core.IColumnHeaderMenu<\code>, which is the current target of the association <code>columnHeaderMenu</code>, or null.
+	 * Returns the column header menu instance that this column is associated with via the <code>headerMenu</code> association.
 	 *
-	 * @returns {sap.ui.core.IColumnHeaderMenu}
+	 * @returns {sap.ui.core.IColumnHeaderMenu | undefined} The column header menu instance
 	 * @private
 	 */
-	Column.prototype.getColumnHeaderMenu = function () {
-		return sap.ui.getCore().byId(this.getAssociation("columnHeaderMenu"));
+	Column.prototype.getHeaderMenuInstance = function () {
+		return Core.byId(this.getAssociation("headerMenu"));
 	};
 
 	function validateCellContentVisibilitySettings(mSettings) {

package/src/sap/ui/table/ColumnMenu.js

@@ -39,12 +39,11 @@ sap.ui.define([
 	 * @class
 	 * The column menu provides all common actions that can be performed on a column.
 	 * @extends sap.ui.unified.Menu
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.table.ColumnMenu
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) design time metamodel
 	 */
 	var ColumnMenu = Menu.extend("sap.ui.table.ColumnMenu", /** @lends sap.ui.table.ColumnMenu.prototype */ {
 		metadata : {
@@ -265,7 +264,18 @@ sap.ui.define([
 				"TBL_GROUP",
 				null,
 				function() {
+					var oDomRef;
 					oTable.setGroupBy(oColumn);
+
+					if (TableUtils.isNoDataVisible(oTable)) {
+						oDomRef = oTable.getDomRef("noDataCnt");
+					} else {
+						oDomRef = oTable.getDomRef("rowsel0");
+					}
+
+					if (oDomRef) {
+						oDomRef.focus();
+					}
 				}
 			));
 		}
@@ -338,7 +348,7 @@ sap.ui.define([
 	 */
 	ColumnMenu.prototype._createColumnVisibilityMenuItem = function(oColumn) {
 		var oTable = this._oTable;
-		var sText = TableUtils.Column.getHeaderText(oTable, oColumn.getIndex());
+		var sText = TableUtils.Column.getHeaderText(oColumn);
 
 		return new MenuItem({
 			text: sText,
@@ -356,6 +366,10 @@ sap.ui.define([
 						});
 					}
 					if (bExecuteDefault) {
+						if (oTable.getFocusDomRef().getAttribute("id") === oColumn.getId()) {
+							var aVisibleColumns = oTable._getVisibleColumns();
+							aVisibleColumns[Math.min(aVisibleColumns.indexOf(oColumn) + 1, TableUtils.getVisibleColumnCount(oTable) - 2)].focus();
+						}
 						oColumn.setVisible(bVisible);
 					}
 				}
@@ -404,7 +418,7 @@ sap.ui.define([
 
 
 	/**
-	 * sets a new filter value into the filter field
+	 * Sets a new filter value into the filter field
 	 * @param {string} sValue value of the filter input field to be set
 	 * @returns {this} this reference for chaining
 	 * @private
@@ -421,7 +435,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * sets a new filter value into the filter field
+	 * Sets the value state of the filter field
 	 * @param {sap.ui.core.ValueState} sFilterState value state for filter text field item
 	 * @returns {this} this reference for chaining
 	 * @private

package/src/sap/ui/table/CreationRow.js

@@ -32,13 +32,12 @@ sap.ui.define([
 	 * <code>sap.ui.commons</code> library.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @alias sap.ui.table.CreationRow
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var CreationRow = Control.extend("sap.ui.table.CreationRow", /** @lends sap.ui.table.CreationRow.prototype */ {
 		metadata: {

package/src/sap/ui/table/Row.js

@@ -135,12 +135,11 @@ sap.ui.define([
 	 * @class
 	 * The row.
 	 * @extends sap.ui.core.Element
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.table.Row
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Row = Element.extend("sap.ui.table.Row", /** @lends sap.ui.table.Row.prototype */ { metadata : {
 		library : "sap.ui.table",
@@ -240,7 +239,6 @@ sap.ui.define([
 	 *
 	 * @returns {int} index of the row (considers scroll position and fixed rows)
 	 * @public
-	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	Row.prototype.getIndex = function() {
 		var oTable = this.getTable();

package/src/sap/ui/table/RowAction.js

@@ -35,13 +35,12 @@ sap.ui.define([
 	 * If more action items are available as the available space allows to display an overflow mechanism is provided.
 	 * This control must only be used in the context of the <code>sap.ui.table.Table</code> control to define row actions.
 	 * @extends sap.ui.core.Control
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.45
 	 * @alias sap.ui.table.RowAction
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var RowAction = Control.extend("sap.ui.table.RowAction", /** @lends sap.ui.table.RowAction.prototype */ {
 		metadata: {

package/src/sap/ui/table/RowActionItem.js

@@ -24,13 +24,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 * @since 1.45
 	 *
 	 * @constructor
 	 * @public
 	 * @alias sap.ui.table.RowActionItem
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var Item = Element.extend("sap.ui.table.RowActionItem", /** @lends sap.ui.table.RowActionItem.prototype */ {
 		metadata: {

package/src/sap/ui/table/RowSettings.js

@@ -24,13 +24,12 @@ sap.ui.define([
 	 * The <code>RowSettings</code> control allows you to configure a row.
 	 * You can only use this control in the context of the <code>sap.ui.table.Table</code> control to define row settings.
 	 * @extends sap.ui.core.Element
-	 * @version 1.105.1
+	 * @version 1.107.0
 	 *
 	 * @constructor
 	 * @public
 	 * @since 1.48.0
 	 * @alias sap.ui.table.RowSettings
-	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var RowSettings = Element.extend("sap.ui.table.RowSettings", /** @lends sap.ui.table.RowSettings.prototype */ {
 		metadata: {