@openui5/sap.ui.table 1.98.0 → 1.101.0

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

@@ -11,9 +11,8 @@ sap.ui.define([
 	"../utils/TableUtils",
 	"../library",
 	"sap/ui/core/Control",
-	"sap/ui/Device",
 	"sap/ui/thirdparty/jquery"
-], function(ExtensionBase, AccRenderExtension, TableUtils, library, Control, Device, jQuery) {
+], function(ExtensionBase, AccRenderExtension, TableUtils, library, Control, jQuery) {
 	"use strict";
 
 	// shortcuts
@@ -866,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;
 
@@ -907,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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Accessibility
@@ -1187,7 +1200,7 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.table.Row} oRow Instance of the row.
 	 * @param {jQuery} $Ref The jQuery references to the DOM areas of the row.
-	 * @param {string} sSelectReference The text for the tooltip.
+	 * @param {string} sTextMouse The text for the tooltip.
 	 * @public
 	 */
 	AccExtension.prototype.updateRowTooltips = function(oRow, $Ref, sTextMouse) {

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.98.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.98.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.98.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.98.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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.KeyboardDelegate

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

@@ -741,6 +741,10 @@ sap.ui.define([
 					return;
 				}
 
+				if (oCellInfo.isOfType(TableUtils.CELLTYPE.COLUMNROWHEADER)) {
+					window.getSelection().empty();
+				}
+
 				var sSelectedText = window.getSelection().toString();
 				if (!oEvent.shiftKey && sSelectedText.length > 0 && sSelectedText !== "\n") {
 					Log.debug("DOM Selection detected -> Click event on table skipped, Target: " + oEvent.target);
@@ -792,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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Pointer

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

@@ -12,7 +12,8 @@ sap.ui.define([
 	"sap/ui/Device",
 	"sap/ui/performance/trace/Interaction",
 	"sap/base/Log",
-	"sap/ui/thirdparty/jquery"
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/dom/jquery/scrollLeftRTL" // provides jQuery.fn.scrollLeftRTL
 ], function(ExtensionBase, TableUtils, library, Device, Interaction, Log, jQuery) {
 	"use strict";
 
@@ -63,7 +64,7 @@ sap.ui.define([
 	/**
 	 * The configuration options for event listeners.
 	 *
-	 * @typedef {Object} sap.ui.table.extensions.Scrolling.EventListenerOptions
+	 * @typedef {object} sap.ui.table.extensions.Scrolling.EventListenerOptions
 	 * @property {sap.ui.table.extensions.Scrolling.ScrollDirection} scrollDirection The scroll direction.
 	 * @private
 	 */
@@ -81,7 +82,7 @@ sap.ui.define([
 	/**
 	 * The interface of a process.
 	 *
-	 * @typedef {Object} ProcessInterface
+	 * @typedef {object} ProcessInterface
 	 * @property {function} cancel Cancels the process.
 	 * @property {function():boolean} isCancelled Whether the process is cancelled.
 	 * @property {function(function)} addCancelListener Adds a listener that is called when the process is cancelled.
@@ -93,7 +94,7 @@ sap.ui.define([
 	/**
 	 * Information about a process.
 	 *
-	 * @typedef {Object} ProcessInfo
+	 * @typedef {object} ProcessInfo
 	 * @property {string} id The id.
 	 * @property {int} rank The rank.
 	 * @property {boolean} cancellable Whether the process can be cancelled.
@@ -2256,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.98.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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.ScrollingIOS

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

@@ -5,8 +5,8 @@
  */
 
 sap.ui.define([
-	"./ExtensionBase", "../Table", "../utils/TableUtils", "../library", "sap/base/Log"
-], function(ExtensionBase, Table, TableUtils, library, Log) {
+	"./ExtensionBase", "../utils/TableUtils", "../library", "sap/base/Log"
+], function(ExtensionBase, TableUtils, library, Log) {
 	"use strict";
 
 	/**
@@ -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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.extensions.Synchronization
@@ -238,7 +238,7 @@ sap.ui.define([
 	/**
 	 * Synchronizes the layout information.
 	 *
-	 * @param {{top:number, headerHeight:number, contentHeight:number}} mLayoutData The layout information.
+	 * @param {{top: number, headerHeight: number, contentHeight: number}} mLayoutData The layout information.
 	 */
 	SyncExtension.prototype.syncLayout = function(mLayoutData) {
 		this.callInterfaceHook("layout", arguments);

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.98.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.98.0
-	 * @since 0.8
-	 * @public
-	 */
-	var thisLib = sap.ui.table;
-
 	/**
 	 * Navigation mode of the table
 	 *
-	 * @version 1.98.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.98.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.98.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.98.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.98.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.98.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.98.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.98.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.98.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.table.plugins.BindingSelection

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

@@ -5,8 +5,6 @@
  */
 sap.ui.define([
 	"./SelectionPlugin",
-	"./SelectionModelSelection",
-	"./BindingSelection",
 	"../library",
 	"../utils/TableUtils",
 	"sap/ui/core/Icon",
@@ -14,8 +12,6 @@ sap.ui.define([
 	"sap/base/Log"
 ], function(
 	SelectionPlugin,
-	SelectionModelSelectionPlugin,
-	BindingSelectionPlugin,
 	library,
 	TableUtils,
 	Icon,

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.98.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.98.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.98.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.98.0
+	 * @version 1.101.0
 	 * @private
 	 * @since 1.76
 	 * @experimental

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

@@ -7,12 +7,14 @@ sap.ui.define([
 	"../library",
 	"../utils/TableUtils",
 	"./RowMode",
-	"sap/ui/Device"
+	"sap/ui/Device",
+	"sap/ui/thirdparty/jquery"
 ], function(
 	library,
 	TableUtils,
 	RowMode,
-	Device
+	Device,
+	jQuery
 ) {
 	"use strict";
 
@@ -33,7 +35,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.98.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.98.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.98.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

@@ -7,13 +7,11 @@ sap.ui.define([
 	"../library",
 	"../utils/TableUtils",
 	"sap/ui/core/Element",
-	"sap/base/Log",
 	"sap/ui/thirdparty/jquery"
 ], function(
 	library,
 	TableUtils,
 	Element,
-	Log,
 	jQuery
 ) {
 	"use strict";
@@ -36,7 +34,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.98.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.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/table/rules/Rows.support.js

@@ -6,8 +6,9 @@
 sap.ui.define([
 	"./TableHelper.support",
 	"sap/ui/support/library",
-	"sap/ui/Device"
-], function(SupportHelper, SupportLibrary, Device) {
+	"sap/ui/Device",
+	"sap/ui/thirdparty/jquery"
+], function(SupportHelper, SupportLibrary, Device, jQuery) {
 	"use strict";
 
 	var Categories = SupportLibrary.Categories;

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

@@ -13,9 +13,9 @@
 @_sap_ui_table_Table_TableHeaderBorderColor: @sapUiListVerticalBorderColor;
 
 // Can be used in other themes to add styles for which there are no style definitions in the base theme and therefore no theme parameters.
-._sap_ui_table_Table_Header() {}
-._sap_ui_table_Table_Extension() {}
-._sap_ui_table_Table_Table() {}
+._sap_ui_table_Table_TitleContainer() {}
+._sap_ui_table_Table_ExtensionContainer() {}
+._sap_ui_table_Table_GridContainer() {}
 
 /*******************************************************************************
  * MAIN TABLE SECTIONS (First Level Elements)
@@ -41,7 +41,7 @@
 		flex: 1 1 auto;
 	}
 
-	._sap_ui_table_Table_Header();
+	._sap_ui_table_Table_TitleContainer();
 }
 
 .sapUiTableHdrTitle {
@@ -53,7 +53,7 @@
 
 .sapUiTableTbr,
 .sapUiTableExt {
-	._sap_ui_table_Table_Extension();
+	._sap_ui_table_Table_ExtensionContainer();
 }
 
 .sapUiTableCnt {
@@ -64,7 +64,7 @@
 	border-right: @_sap_ui_table_BaseBorderWidth solid @sapUiListVerticalBorderColor;
 	border-top: @_sap_ui_table_BaseBorderWidth solid @sapUiListBorderColor;
 	background-color: @sapBackgroundColor;
-	._sap_ui_table_Table_Table();
+	._sap_ui_table_Table_GridContainer();
 }
 
 .sapUiTableFtr {
@@ -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/themes/sap_hcb/Table.less

@@ -6,15 +6,15 @@
 @_sap_ui_table_Table_FocusOutlineOffset: -3px;
 @_sap_ui_table_Table_TableHeaderBorderWidth: 3px;
 
-._sap_ui_table_Table_Header() {
+._sap_ui_table_Table_TitleContainer() {
 	border-bottom: 3px solid @sapUiListHeaderBorderColor;
 }
 
-._sap_ui_table_Table_Extension() {
+._sap_ui_table_Table_ExtensionContainer() {
 	border-bottom: @_sap_ui_table_BaseBorderWidth solid @sapUiListHeaderBorderColor;
 	padding: 0.125rem;
 }
 
-._sap_ui_table_Table_Table() {
+._sap_ui_table_Table_GridContainer() {
 	border: @_sap_ui_table_BaseBorderWidth solid @sapUiListBorderColor;
 }

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

@@ -54,7 +54,7 @@ sap.ui.define([
 	 * @type {sap.ui.table.utils.TableUtils.CellType}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.ui.table.utils.TableUtils.CellType
+	 * @typedef {object} sap.ui.table.utils.TableUtils.CellType
 	 * @property {int} DATACELL - Data cell.
 	 * @property {int} COLUMNHEADER - Column header cell.
 	 * @property {int} ROWHEADER - Row header cell.
@@ -84,7 +84,7 @@ sap.ui.define([
 	 *
 	 * @type {sap.ui.table.utils.TableUtils.BaseSize}
 	 * @static
-	 * @typedef {Object} sap.ui.table.utils.TableUtils.BaseSize
+	 * @typedef {object} sap.ui.table.utils.TableUtils.BaseSize
 	 * @property {int} sapUiSizeCondensed - The default base size in pixels in condensed content density.
 	 * @property {int} sapUiSizeCompact - The default base siz in pixels in compact content density.
 	 * @property {int} sapUiSizeCozy - The default base siz in pixels in cozy content density.
@@ -119,7 +119,7 @@ sap.ui.define([
 	 *
 	 * @type {sap.ui.table.utils.TableUtils.DefaultRowHeight}
 	 * @static
-	 * @typedef {Object} sap.ui.table.utils.TableUtils.DefaultRowHeight
+	 * @typedef {object} sap.ui.table.utils.TableUtils.DefaultRowHeight
 	 * @property {int} sapUiSizeCondensed - The default height of a row in pixels in condensed content density.
 	 * @property {int} sapUiSizeCompact - The default height of a row in pixels in compact content density.
 	 * @property {int} sapUiSizeCozy - The default height of a row in pixels in cozy content density.
@@ -137,7 +137,7 @@ sap.ui.define([
 	 *
 	 * @type {sap.ui.table.utils.TableUtils.ThemeParameters}
 	 * @static
-	 * @typedef {Object} sap.ui.table.utils.TableUtils.ThemeParameters
+	 * @typedef {object} sap.ui.table.utils.TableUtils.ThemeParameters
 	 * @property {string} navigationIcon - Name of the navigation icon.
 	 * @property {string} deleteIcon - Name of the delete icon.
 	 * @property {string} clearSelectionIcon - Name of the clearSelection icon.
@@ -156,7 +156,7 @@ sap.ui.define([
 	 * @type {sap.ui.table.utils.TableUtils.ROWS_UPDATE_REASON}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.ui.table.utils.TableUtils.ROWS_UPDATE_REASON
+	 * @typedef {object} sap.ui.table.utils.TableUtils.ROWS_UPDATE_REASON
 	 * @property {string} Sort - {@link sap.ui.model.ChangeReason.Sort}
 	 * @property {string} Filter - {@link sap.ui.model.ChangeReason.Filter}
 	 * @property {string} Change - {@link sap.ui.model.ChangeReason.Change}
@@ -203,7 +203,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.98.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") {
@@ -565,7 +579,7 @@ sap.ui.define([
 		 * @param {sap.ui.table.Table} oTable Instance of the table.
 		 * @returns {sap.ui.table.utils.TableUtils.FocusedItemInfo | null} Returns the information about the focused item, or <code>null</code>, if the
 		 *                                                           item navigation is not yet initialized.
-		 * @typedef {Object} sap.ui.table.utils.TableUtils.FocusedItemInfo
+		 * @typedef {object} sap.ui.table.utils.TableUtils.FocusedItemInfo
 		 * @property {int} cell Index of focused cell in the ItemNavigation.
 		 * @property {int} columnCount Number of columns in the ItemNavigation.
 		 * @property {int} cellInRow Index of the cell in the row.
@@ -649,7 +663,7 @@ sap.ui.define([
 		 *     <li><b>cell</b>: Is <code>null</code>, if the cell is not a table cell.</li>
 		 * </ul>
 		 *
-		 * @typedef {Object} sap.ui.table.utils.TableUtils.CellInfo
+		 * @typedef {object} sap.ui.table.utils.TableUtils.CellInfo
 		 * @property {sap.ui.table.utils.TableUtils.CellType} [type] The type of the cell.
 		 * @property {int | null} [rowIndex] The index of the row the cell is inside.
 		 * @property {int | null} columnIndex The index of the column, in the <code>columns</code> aggregation, the cell is inside.
@@ -970,7 +984,7 @@ sap.ui.define([
 		 * sapUiSizeCompact, sapUiSizeCondensed, sapUiSizeCozy
 		 *
 		 * @param {sap.ui.table.Table} oControl Instance of the table.
-		 * @returns {String | undefined} name of the content density style class or undefined if none was found.
+		 * @returns {string | undefined} name of the content density style class or undefined if none was found.
 		 */
 		getContentDensity: function(oControl) {
 			var sContentDensity;