@openui5/sap.ui.table 1.100.0 → 1.101.0

package/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+	"overrides": [
+		/*
+		 * Productive code, sample and unit test code of sap.ui.table has been cleaned up.
+		 * No more references to the global jQuery allowed
+		 */
+		{
+			"files": [
+				"src/**/*.js",
+				"test/sap/ui/table/demokit/**/*.js",
+				"test/sap/ui/table/qunit/**/*.js"
+			],
+			"globals": {
+				"jQuery": "off"
+			}
+		}
+	]
+}

package/THIRDPARTY.txt

@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,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.1.36-SNAPSHOT
+Component: SAP Theming Base Content, version: 11.1.38
 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.ui.table",
-  "version": "1.100.0",
+  "version": "1.101.0",
   "description": "OpenUI5 UI Library sap.ui.table",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.100.0",
-    "@openui5/sap.ui.unified": "1.100.0"
+    "@openui5/sap.ui.core": "1.101.0",
+    "@openui5/sap.ui.unified": "1.101.0"
   }
 }

package/src/sap/ui/table/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.100.0</version>
+  <version>1.101.0</version>
 
   <documentation>Table-like controls, mainly for desktop scenarios.</documentation>
 

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

@@ -46,7 +46,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -363,11 +363,13 @@ sap.ui.define([
 	 *   <li>The column's <code>leadingProperty</code> must be a sortable and filterable dimension.</li>
 	 * </ul>
 	 *
-	 * @protected
+	 * @private
+	 * @ui5-restricted sap.ui.comp
 	 * @return {boolean} <code>true</code> if the column is groupable
 	 */
-	AnalyticalColumn.prototype.isGroupable = function() {
+	AnalyticalColumn.prototype.isGroupableByMenu = function() {
 		var oParent = this.getParent();
+
 		if (isInstanceOfAnalyticalTable(oParent)) {
 			var oBinding = oParent.getBinding();
 			if (oBinding) {

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

@@ -23,7 +23,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 	 * @extends sap.ui.table.ColumnMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -59,7 +59,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 		var oColumn = this._oColumn,
 			oTable = this._oTable;
 
-		if (oColumn.isGroupable()) {
+		if (oColumn.isGroupableByMenu()) {
 			this._oGroupIcon = this._createMenuItem(
 				"group",
 				"TBL_GROUP",

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

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @see http://scn.sap.com/docs/DOC-44986
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -68,7 +68,7 @@ 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.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -592,10 +592,10 @@ sap.ui.define([
 	 * happens for generated menus.
 	 * @private
 	 */
-	Column.prototype.invalidateMenu = function() {
+	Column.prototype._invalidateMenu = function() {
 		var oMenu = this.getAggregation("menu");
 
-		if (this._bMenuIsColumnMenu) {
+		if (oMenu && this._bMenuIsColumnMenu) {
 			oMenu._invalidate();
 		}
 	};
@@ -615,7 +615,7 @@ sap.ui.define([
 						   || (oTable ? oTable.getShowColumnVisibilityMenu() : false)
 						   || this.isSortableByMenu()
 						   || this.isFilterableByMenu()
-						   || this.isGroupable();
+						   || this.isGroupableByMenu();
 
 		if (bHasOwnItems) {
 			return true;
@@ -665,7 +665,7 @@ sap.ui.define([
 	 *
 	 * @returns {boolean}
 	 */
-	Column.prototype.isGroupable = function() {
+	Column.prototype.isGroupableByMenu = function() {
 		var oTable = this.getParent();
 		return !!(oTable && oTable.getEnableGrouping && oTable.getEnableGrouping() && this.getSortProperty());
 	};
@@ -696,10 +696,20 @@ sap.ui.define([
 	 */
 	Column.prototype.setSortProperty = function(sValue) {
 		this.setProperty("sortProperty", sValue);
-		this.invalidateMenu();
+		this._invalidateMenu();
 		return this;
 	};
 
+	/*
+	 * @see JSDoc generated by SAPUI5 control API generator
+	 */
+	Column.prototype.setShowSortMenuEntry = function(sValue) {
+		if (this.getShowSortMenuEntry() != sValue) {
+			this._invalidateMenu();
+		}
+		return this.setProperty("showSortMenuEntry", sValue);
+	};
+
 	/*
 	 * @see JSDoc generated by SAPUI5 control API generator
 	 */
@@ -722,10 +732,20 @@ sap.ui.define([
 	 * @see JSDoc generated by SAPUI5 control API generator
 	 */
 	Column.prototype.setFilterProperty = function(sValue) {
-		this.invalidateMenu();
+		this._invalidateMenu();
 		return this.setProperty("filterProperty", sValue);
 	};
 
+	/*
+	 * @see JSDoc generated by SAPUI5 control API generator
+	 */
+	Column.prototype.setShowFilterMenuEntry = function(sValue) {
+		if (this.getShowFilterMenuEntry() != sValue) {
+			this._invalidateMenu();
+		}
+		return this.setProperty("showFilterMenuEntry", sValue);
+	};
+
 	/*
 	 * @see JSDoc generated by SAPUI5 control API generator
 	 */

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

@@ -39,7 +39,7 @@ 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.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -145,6 +145,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ColumnMenu.prototype._invalidate = function() {
+		this._removeColumnVisibilityFromAggregation();
+		this.destroyItems();
 		this._bInvalidated = true;
 	};
 
@@ -156,8 +158,6 @@ sap.ui.define([
 	ColumnMenu.prototype.open = function() {
 		if (this._bInvalidated) {
 			this._bInvalidated = false;
-			this._removeColumnVisibilityFromAggregation();
-			this.destroyItems();
 			this._addMenuItems();
 		} else if (this._oColumn) {
 			this._addColumnVisibilityMenuItem();
@@ -257,7 +257,7 @@ sap.ui.define([
 	ColumnMenu.prototype._addGroupMenuItem = function() {
 		var oColumn = this._oColumn;
 
-		if (oColumn.isGroupable()) {
+		if (oColumn.isGroupableByMenu()) {
 			var oTable = this._oTable;
 
 			this.addItem(this._createMenuItem(

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * <code>sap.ui.commons</code> library.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @class
 	 * The row.
 	 * @extends sap.ui.core.Element
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -688,7 +688,8 @@ sap.ui.define([
 	 * The <code>RowAction</code> is generated based on a template. Manipulations of the object or its items are not supported.
 	 *
 	 * @return {sap.ui.table.RowAction} The related <code>RowAction</code> of the row.
-	 * @protected
+	 * @private
+	 * @ui5-restricted For testing purposes only
 	 */
 	Row.prototype.getRowAction = function() {
 		return this.getAggregation("_rowAction");

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

@@ -35,7 +35,7 @@ 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.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @since 1.45
 	 *
 	 * @constructor

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

@@ -24,7 +24,7 @@ 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.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -92,7 +92,7 @@ sap.ui.define([
 	 *     the data model and binding being used.
 	 * </p>
 	 * @extends sap.ui.core.Control
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -202,11 +202,12 @@ sap.ui.define([
 			navigationMode : {type : "sap.ui.table.NavigationMode", group : "Behavior", defaultValue : NavigationMode.Scrollbar, deprecated: true},
 
 			/**
-			 * The <code>threshold</code> defines how many additional (not yet visible records) shall be pre-fetched to enable smooth
-			 * scrolling. The threshold is always added to the <code>visibleRowCount</code>. If the <code>visibleRowCount</code> is 10 and the
+			 * Defines how many additional (not yet visible) data records from the back-end system are pre-fetched to enable smooth scrolling.
+			 * The threshold is always added to the <code>visibleRowCount</code>. If the <code>visibleRowCount</code> is 10 and the
 			 * <code>threshold</code> is 100, there will be 110 records fetched with the initial load.
-			 * If the <code>threshold</code> is lower than the <code>visibleRowCount</code>, the <code>visibleRowCount</code> will be used as
-			 * the <code>threshold</code>. If the value is 0 then the thresholding is disabled.
+			 * If the <code>threshold</code> is lower than the number of rows in the scrollable area (<code>visibleRowCount</code> minus number of
+			 * fixed rows), this number is used as the <code>threshold</code>.
+			 * If the value is 0, thresholding is disabled.
 			 */
 			threshold : {type : "int", group : "Appearance", defaultValue : 100},
 
@@ -449,6 +450,14 @@ sap.ui.define([
 			 */
 			noData : {type : "sap.ui.core.Control", altTypes : ["string"], multiple : false},
 
+			/**
+			 * The control that is shown in case the Table has no visible columns.
+			 *
+			 * @private
+			 * @ui5-restricted sap.ui.mdc, sap.ui.comp
+			 */
+			_noColumnsMessage: {type : "sap.ui.core.Control", multiple : false, visibility: "hidden"},
+
 			/**
 			 * Template for row actions. A template is decoupled from the row or table. Each time
 			 * the template's properties or aggregations are changed, the template has to be applied again via
@@ -3518,7 +3527,7 @@ sap.ui.define([
 	 *
 	 * @returns {int} The actual fixed column count computed based on the column spans of the header, the width of the
 	 * table and the width of the columns.
-	 * @protected
+	 * @private
 	 */
 	Table.prototype.getComputedFixedColumnCount = function() {
 		if (this._bIgnoreFixedColumnCount) {
@@ -3647,7 +3656,7 @@ sap.ui.define([
 	Table.prototype._invalidateColumnMenus = function() {
 		var aCols = this.getColumns();
 		for (var i = 0, l = aCols.length; i < l; i++) {
-			aCols[i].invalidateMenu();
+			aCols[i]._invalidateMenu();
 		}
 	};
 
@@ -3769,6 +3778,16 @@ sap.ui.define([
 		this.setAggregation("noData", vNoData, true);
 		var sNewNoDataText = TableUtils.getNoDataText(this);
 
+		if (TableUtils.isA(vNoData, "sap.m.IllustratedMessage")) {
+			var oNoColumnsMessage = this.getAggregation("_noColumnsMessage");
+			if (!oNoColumnsMessage) {
+				sap.ui.require(["sap/m/table/Util"], function(MTableUtil) {
+					oNoColumnsMessage = MTableUtil.getNoColumnsIllustratedMessage();
+					this.setAggregation("_noColumnsMessage", oNoColumnsMessage);
+				}.bind(this));
+			}
+		}
+
 		// Avoid table re-rendering if only the text is changed. If the NoData text was, or will be a control, the table must be re-rendered.
 		if (sOldNoDataText != null && sNewNoDataText != null) {
 			// Old and new NoData texts are plain strings, therefore we are able to directly update the DOM in case of a text change.

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

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @since 1.21.1
 	 *
 	 * @constructor

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

@@ -300,8 +300,10 @@ sap.ui.define(['sap/ui/core/Control', 'sap/ui/Device', './library', "./Column",
 		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "NODATA");
 		rm.openEnd();
 
-		if (oTable.getNoData() instanceof Control && oTable._getVisibleColumns().length > 0) {
-			rm.renderControl(oTable.getNoData());
+		var oNoContentMessage = TableUtils.getNoContentMessage(oTable);
+
+		if (oNoContentMessage instanceof Control) {
+			rm.renderControl(oNoContentMessage);
 		} else {
 			rm.openStart("span", oTable.getId() + "-noDataMsg");
 			rm.class("sapUiTableCtrlEmptyMsg");

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

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @class
 	 * The TreeTable control provides a comprehensive set of features to display hierarchical data.
 	 * @extends sap.ui.table.Table
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/table/extensions/Accessibility.js

@@ -865,8 +865,22 @@ sap.ui.define([
 
 				case AccExtension.ELEMENTTYPES.NODATA: //The no data container
 					mAttributes["role"] = "gridcell";
-					var oNoData = oTable.getNoData();
-					mAttributes["aria-labelledby"] = [oNoData instanceof Control ? oNoData.getId() : (sTableId + "-noDataMsg")];
+					var oNoContentMessage = TableUtils.getNoContentMessage(oTable);
+					var aLabels = [];
+
+					if (oNoContentMessage instanceof Control) {
+						if (oNoContentMessage.isA("sap.m.IllustratedMessage")) {
+							var oAccRef = oNoContentMessage.getAccessibilityReferences();
+							aLabels.push(oAccRef.title);
+							aLabels.push(oAccRef.description);
+						} else {
+							aLabels.push(oNoContentMessage.getId());
+						}
+					} else {
+						aLabels.push(sTableId + "-noDataMsg");
+					}
+
+					mAttributes["aria-labelledby"] = aLabels;
 					addAriaForOverlayOrNoData(oTable, mAttributes, true, false);
 					break;
 
@@ -906,7 +920,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility

package/src/sap/ui/table/extensions/AccessibilityRender.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.TableRenderer which handles ACC related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.AccessibilityRender

package/src/sap/ui/table/extensions/DragAndDrop.js

@@ -244,7 +244,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.DragAndDrop

package/src/sap/ui/table/extensions/ExtensionBase.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @abstract
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ExtensionBase

package/src/sap/ui/table/extensions/Keyboard.js

@@ -267,7 +267,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles keyboard related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Keyboard

package/src/sap/ui/table/extensions/KeyboardDelegate.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.base.Object
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate

package/src/sap/ui/table/extensions/Pointer.js

@@ -796,7 +796,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles mouse and touch related things.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

package/src/sap/ui/table/extensions/Scrolling.js

@@ -2257,7 +2257,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles scrolling.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Scrolling

package/src/sap/ui/table/extensions/ScrollingIOS.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table which handles the scrollbar on iOS.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

package/src/sap/ui/table/extensions/Synchronization.js

@@ -142,7 +142,7 @@ sap.ui.define([
 	 * @class Extension for sap.ui.table.Table that allows synchronization with a table.
 	 * @extends sap.ui.table.extensions.ExtensionBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization

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

@@ -14,10 +14,19 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 
 	"use strict";
 
-	// delegate further initialization of this library to the Core
-	sap.ui.getCore().initLibrary({
+	/**
+	 * Table-like controls, mainly for desktop scenarios.
+	 *
+	 * @namespace
+	 * @alias sap.ui.table
+	 * @author SAP SE
+	 * @version 1.101.0
+	 * @since 0.8
+	 * @public
+	 */
+	var thisLib = sap.ui.getCore().initLibrary({
 		name : "sap.ui.table",
-		version: "1.100.0",
+		version: "1.101.0",
 		dependencies : ["sap.ui.core","sap.ui.unified"],
 		designtime: "sap/ui/table/designtime/library.designtime",
 		types: [
@@ -68,22 +77,10 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 		}
 	});
 
-	/**
-	 * Table-like controls, mainly for desktop scenarios.
-	 *
-	 * @namespace
-	 * @alias sap.ui.table
-	 * @author SAP SE
-	 * @version 1.100.0
-	 * @since 0.8
-	 * @public
-	 */
-	var thisLib = sap.ui.table;
-
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -111,7 +108,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Row Action types.
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -142,7 +139,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Selection behavior of the table
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -173,7 +170,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Selection mode of the table
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -211,7 +208,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * Sort order of a column
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -236,7 +233,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	/**
 	 * VisibleRowCountMode of the table
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 * @ui5-metamodel This enumeration also will be described in the UI5 (legacy) designtime metamodel
@@ -268,7 +265,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	 *
 	 * Contains IDs of shared DOM references, which should be accessible to inheriting controls via getDomRef() function.
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @enum {string}
 	 * @public
 	 */
@@ -366,7 +363,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/model/TreeAutoExpandMode',
 	 *
 	 * This is an alias for {@link sap.ui.model.TreeAutoExpandMode} and kept for compatibility reasons.
 	 *
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @typedef {sap.ui.model.TreeAutoExpandMode}
 	 * @public
 	 */

package/src/sap/ui/table/plugins/BindingSelection.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @class Implements the selection methods for TreeTable and AnalyticalTable
 	 * @extends sap.ui.table.plugins.SelectionPlugin
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.BindingSelection

package/src/sap/ui/table/plugins/PluginBase.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @private
 	 * @experimental Since 1.75

package/src/sap/ui/table/plugins/SelectionModelSelection.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @class Implements the selection methods for a Table
 	 * @extends sap.ui.table.plugins.SelectionPlugin
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.SelectionModelSelection

package/src/sap/ui/table/plugins/SelectionPlugin.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class Implements the selection methods for a table.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @public
 	 * @since 1.64
 	 * @experimental As of version 1.64

package/src/sap/ui/table/plugins/V4Aggregation.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class TODO (don't forget to document fixed row count restrictions because fixed rows are set by this plugin)
 	 * @extends sap.ui.table.plugins.PluginBase
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.76
 	 * @experimental

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

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

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */

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

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

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.rowmodes.RowMode
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/table/themes/base/Table.less

@@ -164,6 +164,12 @@
 	}
 }
 
+.sapUiTableCtrlEmpty > .sapMIllustratedMessage {
+	position: absolute;
+	top: 50%;
+	transform: translate(0, -50%);
+}
+
 .sapUiTableOverlayArea {
 	background-color: transparent;
 	z-index: 12;

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.100.0
+	 * @version 1.101.0
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private
@@ -478,7 +478,21 @@ 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.
 		 *
@@ -486,12 +500,12 @@ sap.ui.define([
 		 * @returns {string | null} The no data text.
 		 */
 		getNoDataText: function(oTable) {
-			if (TableUtils.getVisibleColumnCount(oTable) === 0) {
+			var vNoData = oTable.getNoData();
+
+			if (TableUtils.getVisibleColumnCount(oTable) === 0 && !TableUtils.isA(vNoData, "sap.m.IllustratedMessage")) {
 				return TableUtils.getResourceText("TBL_NO_COLUMNS");
 			}
 
-			var vNoData = oTable.getNoData();
-
 			if (TableUtils.isA(vNoData, "sap.ui.core.Control")) {
 				return null;
 			} else if (typeof vNoData === "string") {

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.100.0
+	 * @version 1.101.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.100.0
+	 * @version 1.101.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._ColumnUtils
 	 * @private

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.100.0
+	 * @version 1.101.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.100.0
+	 * @version 1.101.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

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

@@ -42,7 +42,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.100.0
+	 * @version 1.101.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private