@openui5/sap.ui.mdc 1.97.1 → 1.100.0

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

@@ -23,6 +23,7 @@ sap.ui.define([
 	"sap/ui/core/dnd/DragDropInfo",
 	"sap/ui/core/Item",
 	"sap/ui/core/format/ListFormat",
+	"sap/ui/core/library",
 	"sap/ui/events/KeyCodes",
 	"sap/ui/model/Sorter",
 	"sap/ui/dom/containsOrEquals",
@@ -39,7 +40,10 @@ sap.ui.define([
 	"sap/m/ColumnPopoverSelectListItem",
 	"sap/m/ColumnPopoverActionItem",
 	"sap/ui/mdc/p13n/subcontroller/ColumnWidthController",
-	"sap/ui/mdc/actiontoolbar/ActionToolbarAction"
+	"sap/ui/mdc/actiontoolbar/ActionToolbarAction",
+	"sap/ui/mdc/table/RowActionItem",
+	"sap/ui/base/ManagedObjectMetadata",
+	"sap/ui/mdc/table/RowSettings"
 ], function(
 	Control,
 	ActionToolbar,
@@ -59,6 +63,7 @@ sap.ui.define([
 	DragDropInfo,
 	Item,
 	ListFormat,
+	coreLibrary,
 	KeyCodes,
 	Sorter,
 	containsOrEquals,
@@ -75,7 +80,10 @@ sap.ui.define([
 	ColumnPopoverSelectListItem,
 	ColumnPopoverActionItem,
 	ColumnWidthController,
-	ActionToolbarAction
+	ActionToolbarAction,
+	RowActionItem,
+	ManagedObjectMetadata,
+	RowSettings
 ) {
 	"use strict";
 
@@ -85,6 +93,7 @@ sap.ui.define([
 	var ToolbarDesign = MLibrary.ToolbarDesign;
 	var ToolbarStyle = MLibrary.ToolbarStyle;
 	var MultiSelectMode = library.MultiSelectMode;
+	var TitleLevel = coreLibrary.TitleLevel;
 	var internalMap = new window.WeakMap();
 	var internal = function(oTable) {
 		if (!internalMap.has(oTable)) {
@@ -108,14 +117,13 @@ sap.ui.define([
 	 * Constructor for a new <code>MDCTable</code>.
 	 *
 	 * @param {string} [sId] Optional ID for the new control; generated automatically if no non-empty ID is given
-	 * <b>Note:</b> this can be omitted, no matter whether <code>mSettings</code> will be given or not.
+	 * <b>Note:</b> The optional ID can be omitted, no matter whether <code>mSettings</code> is given or not.
 	 * @param {object} [mSettings] Object with initial settings for the new control
 	 * @class
-	 * <p>
-	 *     A metadata-driven table to simplify the usage of existing tables, such as the <code>ResponsiveTable</code> and <code>GridTable</code>
-	 *     controls. The metadata needs to be provided via the {@link sap.ui.mdc.TableDelegate TableDelegate} implementation in the form of a
-	 *     <code>PropertyInfo</code>.
-	 * </p>
+	 * A metadata-driven table to simplify the usage of existing tables, such as the <code>ResponsiveTable</code> and <code>GridTable</code>
+	 * controls. The metadata needs to be provided via the {@link module:sap/ui/mdc/TableDelegate TableDelegate} implementation as
+	 * {@link sap.ui.mdc.table.PropertyInfo}.
+	 *
 	 * @extends sap.ui.mdc.Control
 	 * @author SAP SE
 	 * @private
@@ -158,6 +166,7 @@ sap.ui.define([
 				 * Actions available for a table row.
 				 *
 				 * @since 1.60
+				 * @deprecated as of version 1.98, use row settings instead.
 				 */
 				rowAction: {
 					type: "sap.ui.mdc.RowAction[]",
@@ -196,7 +205,7 @@ sap.ui.define([
 				headerLevel: {
 					type: "sap.ui.core.TitleLevel",
 					group: "Appearance",
-					defaultValue: sap.ui.core.TitleLevel.Auto
+					defaultValue: TitleLevel.Auto
 				},
 				/**
 				 * Determines whether to bind the table automatically after the initial creation or re-creation of the table.
@@ -264,7 +273,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Determines the text shown when the table has no data.
+				 * Determines the text shown if the table has no data.
 				 *
 				 * @since 1.63
 				 */
@@ -273,10 +282,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Sort conditions.
+				 * Defines the sort conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.73
 				 */
@@ -285,10 +294,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Filter conditions.
+				 * Defines the filter conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.80.0
 				 */
@@ -298,10 +307,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Group conditions.
+				 * Defines the group conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is used exclusively for handling SAPUI5 flexibility changes. Do not use it otherwise.
 				 *
 				 * @since 1.87
 				 */
@@ -310,10 +319,10 @@ sap.ui.define([
 				},
 
 				/**
-				 * Aggregate conditions.
+				 * Defines the aggregate conditions.
 				 *
 				 * <b>Note</b>: This property must not be bound.<br>
-				 * <b>Note:</b> This property is exclusively used for handling flexibility changes.
+				 * <b>Note:</b> This property is exclusively used for handling SAPUI5 flexibility changes.
 				 *
 				 * @since 1.87
 				 */
@@ -322,7 +331,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Determines whether table data export is enabled.
+				 * Determines whether the table data export is enabled.
 				 *
 				 * @since 1.75
 				 */
@@ -385,12 +394,14 @@ sap.ui.define([
 				/**
 				 * Enables automatic column width calculation based on metadata information if set to <code>true</code>.
 				 * The column width calculation takes the type, column label, referenced properties, and many other metadata parameters into account.
-				 * Providing a more precise <code>maxLength</code> value for the <code>String</code> type or <code>precision</code> value for numeric types can help this algorithm to produce better results.
+				 * Providing a more precise <code>maxLength</code> value for the <code>String</code> type or <code>precision</code> value for numeric
+				 * types can help this algorithm to produce better results.
 				 * The calculated column widths can have a minimum of 3rem and a maximum of 20rem.
 				 *
-				 * <b>Note:</b> To customize the automatic column width calculation the <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> can be used.
-				 * To avoid the heuristic column width calculation for a particular column, the <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> must be set to <code>null</code>.
-				 * This feature has no effect if the <code>width</code> property of the column is bound or its value is set.
+				 * <b>Note:</b> To customize the automatic column width calculation, the <code>visualSettings.widthSettings</code> key of the
+				 * <code>PropertyInfo</code> can be used. To avoid the heuristic column width calculation for a particular column, the
+				 * <code>visualSettings.widthSettings</code> key of the <code>PropertyInfo</code> must be set to <code>null</code>. This feature has
+				 * no effect if the <code>width</code> property of the column is bound or its value is set.
 				 *
 				 * @since 1.95
 				 */
@@ -426,7 +437,7 @@ sap.ui.define([
 
 				/**
 				 * This row can be used for user input to create new data if {@link sap.ui.mdc.TableType TableType} is "<code>Table</code>".
-				 * <b>Note:</b> Once the binding implements support for creating transient records, this aggregation will be removed.
+				 * <b>Note:</b> Once the binding supports creating transient records, this aggregation will be removed.
 				 */
 				creationRow: {
 					type: "sap.ui.mdc.table.CreationRow",
@@ -472,9 +483,9 @@ sap.ui.define([
 				/**
 				 * <code>DataStateIndicator</code> plugin that can be used to show binding-related messages.
 				 *
-				 * <b>Note:</b> The message filtering is not yet supported for this control therefore
-				 * {@link sap.m.plugins.DataStateIndicator#getEnableFiltering enableFiltering} property of the <code>DataStateIndicator</code> must
-				 * not be set to <code>true</code>.
+				 * <b>Note:</b> The message filtering is not yet supported for this control. Therefore the
+				 * {@link sap.m.plugins.DataStateIndicator#getEnableFiltering enableFiltering} property of the <code>DataStateIndicator</code> plugin
+				 * must not be set to <code>true</code>.
 				 *
 				 * @since 1.89
 				 */
@@ -495,7 +506,7 @@ sap.ui.define([
 			},
 			events: {
 				/**
-				 * Fired when a row in the table is pressed.
+				 * This event is fired when a row in the table is pressed.
 				 */
 				rowPress: {
 					parameters: {
@@ -508,7 +519,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired when the selection in the table is changed.
+				 * This event is fired when the selection in the table is changed.
 				 */
 				selectionChange: {
 					parameters: {
@@ -525,7 +536,7 @@ sap.ui.define([
 							type: "boolean"
 						},
 						/**
-						 * Identifies whether selectAll was pressed
+						 * Identifies whether the Select All checkbox was pressed
 						 */
 						selectAll: {
 							type: "boolean"
@@ -533,7 +544,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired right before the export is triggered.
+				 * This event is fired right before the export is triggered.
 				 *
 				 * For more information about the export settings, see {@link sap.ui.export.Spreadsheet} or
 				 * {@link topic:7e12e6b9154a4607be9d6072c72d609c Spreadsheet Export Configuration}.
@@ -560,7 +571,7 @@ sap.ui.define([
 					}
 				},
 				/**
-				 * Fired when the user pastes content from the clipboard to the table.
+				 * This event is fired when the user pastes content from the clipboard to the table.
 				 */
 				paste: {
 					parameters: {
@@ -661,6 +672,7 @@ sap.ui.define([
 	 * @inheritDoc
 	 */
 	Table.prototype.applySettings = function() {
+		this._setPropertyHelperClass(PropertyHelper);
 		Control.prototype.applySettings.apply(this, arguments);
 		this.initControlDelegate();
 	};
@@ -715,7 +727,7 @@ sap.ui.define([
 	Table.prototype._onApplyMessageFilter = function(oEvent) {
 		this._oMessageFilter = oEvent.getParameter("filter");
 		oEvent.preventDefault();
-		this.rebind();
+		this._rebind();
 	};
 
 	/**
@@ -725,7 +737,7 @@ sap.ui.define([
 	Table.prototype._onClearMessageFilter = function(oEvent) {
 		this._oMessageFilter = null;
 		oEvent.preventDefault();
-		this.rebind();
+		this._rebind();
 	};
 
 	// ----Type----
@@ -865,18 +877,24 @@ sap.ui.define([
 	// ----End Type----
 
 	Table.prototype.setRowSettings = function(oRowSettings) {
+		if (this._oTableRowAction) {
+			if (oRowSettings.getRowActions().length == 0) {
+				oRowSettings.addRowAction(this._oTableRowAction);
+			}
+		}
 		this.setAggregation("rowSettings", oRowSettings, true);
 
 		if (this._oTable) {
 			// Apply the new setting to the existing table
+			this._oRowActions = {};
 			if (this._isOfType(TableType.ResponsiveTable)) {
-				ResponsiveTableType.updateRowSettings(this._oTemplate, oRowSettings);
+				ResponsiveTableType.updateRowSettings(this, oRowSettings, this._onResponsiveRowActionPress);
 			} else {
-				GridTableType.updateRowSettings(this._oTable, oRowSettings);
+				GridTableType.updateRowSettings(this._oTable, oRowSettings, [this._onRowActionPress, this]);
 			}
 
 			this._bForceRebind = true;
-			this.checkAndRebind();
+			this._rebind();
 		}
 
 		return this;
@@ -938,14 +956,20 @@ sap.ui.define([
 		return this;
 	};
 
+	// TODO: Temporary solution until apps adapted changes. Remove this, as this is replaced by rowSettings
 	Table.prototype.setRowAction = function(aActions) {
-		var aOldActions = this.getRowAction();
-
 		this.setProperty("rowAction", aActions, true);
 
-		if (!deepEqual(aOldActions.sort(), this.getRowAction().sort())) {
-			this._updateRowAction();
+		var oRowSettings = this.getRowSettings() || new RowSettings();
+
+		oRowSettings.destroyRowActions();
+		if (this.getRowAction().indexOf(RowAction.Navigation) > -1) {
+			this._oTableRowAction = new RowActionItem({
+				type: RowAction.Navigation
+			});
+			oRowSettings.addRowAction(this._oTableRowAction);
 		}
+		this.setRowSettings(oRowSettings);
 
 		return this;
 	};
@@ -973,21 +997,20 @@ sap.ui.define([
 	};
 
 	Table.prototype._onModifications = function() {
-		if (!this._oTable) {
-			return;
-		}
-		var oColumnWidth = this.getCurrentState().xConfig;
-		var oColumnWidthContent = oColumnWidth.aggregations && oColumnWidth.aggregations.columns;
-
-		this.getColumns().forEach(function(oColumn, iIndex) {
-			var sWidth = oColumnWidthContent && oColumnWidthContent[oColumn.getDataProperty()] && oColumnWidthContent[oColumn.getDataProperty()].width;
-			var oInnerColumn = this._oTable.getColumns()[iIndex];
-			if (!sWidth && oInnerColumn.getWidth() !== oColumn.getWidth()) {
-				oInnerColumn.setWidth(oColumn.getWidth());
-			} else if (sWidth && sWidth !== oInnerColumn.getWidth()) {
-				oInnerColumn.setWidth(sWidth);
-			}
-		}, this);
+		var oMDCTable = this;
+		this.initialized().then(function() {
+			var oColumnWidth = oMDCTable.getCurrentState().xConfig;
+			var oColumnWidthContent = oColumnWidth.aggregations && oColumnWidth.aggregations.columns;
+			oMDCTable.getColumns().forEach(function(oColumn, iIndex) {
+				var sWidth = oColumnWidthContent && oColumnWidthContent[oColumn.getDataProperty()] && oColumnWidthContent[oColumn.getDataProperty()].width;
+				var oInnerColumn = oMDCTable._oTable.getColumns()[iIndex];
+				if (!sWidth && oInnerColumn.getWidth() !== oColumn.getWidth()) {
+					oInnerColumn.setWidth(oColumn.getWidth());
+				} else if (sWidth && sWidth !== oInnerColumn.getWidth()) {
+					oInnerColumn.setWidth(sWidth);
+				}
+			});
+		});
 	};
 
 	Table.prototype.setP13nMode = function(aMode) {
@@ -1286,10 +1309,9 @@ sap.ui.define([
 		if (!this._oTable) {
 			return;
 		}
-		var bNavigation = this.getRowAction().indexOf(RowAction.Navigation) > -1;
 		var oType = this._bMobileTable ? ResponsiveTableType : GridTableType;
 		// For ResponsiveTable itemPress event is registered during creation
-		oType.updateRowAction(this, bNavigation, this._bMobileTable ? undefined : this._onRowActionPress);
+		oType.updateRowActions(this, this.getRowSettings(), this._bMobileTable ? this._onResponsiveRowActionPress : this._onRowActionPress);
 	};
 
 	Table.prototype._initializeContent = function() {
@@ -1362,7 +1384,10 @@ sap.ui.define([
 		this._onAfterTableCreated(true); // Resolve any pending promise if table exists
 
 		var pTableInit = this.initialized().then(function() {
-			this.initPropertyHelper(PropertyHelper);
+			this.initPropertyHelper();
+
+			//Make sure that in case of default xConfig appliance the state is initially read once
+			this._onModifications();
 
 			// add this to the micro task execution queue to enable consumers to handle this correctly
 			var oCreationRow = this.getCreationRow();
@@ -1371,7 +1396,7 @@ sap.ui.define([
 			}
 
 			if (this.getAutoBindOnInit()) {
-				this.checkAndRebind();
+				this.rebind();
 			}
 
 			return this.awaitPropertyHelper();
@@ -1493,7 +1518,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the current filter conditions present on the table
+	 * Returns the current filter conditions present on the table.
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -1729,13 +1754,28 @@ sap.ui.define([
 			var oRowBinding = that._getRowBinding();
 			var mExportSettings = {
 				workbook: {
-					columns: aSheetColumns
+					columns: aSheetColumns,
+					context: {title: that.getHeader()}
 				},
 				dataSource: oRowBinding,
-				fileType: mCustomConfig.selectedFileType == "pdf" ? "PDF" : "XLSX",
-				fileName: mCustomConfig ? mCustomConfig.fileName : that.getHeader()
+				fileType: mCustomConfig.selectedFileType,
+				fileName: mCustomConfig ? mCustomConfig.fileName : this.getHeader()
 			};
 
+			var mPDFUserSettings = {
+				border: mCustomConfig.border,
+				fontSize: mCustomConfig.fontSize,
+				paperSize: mCustomConfig.selectedPaperSize,
+				doEnableAccessibility: mCustomConfig.doEnableAccessibility,
+				signature: mCustomConfig.signature,
+				signatureReason: mCustomConfig.signatureReason,
+				orientation: mCustomConfig.selectedOrientation
+			};
+
+			if (mExportSettings.fileType === "PDF") {
+				Object.assign(mExportSettings, mPDFUserSettings);
+			}
+
 			that._loadExportLibrary().then(function() {
 				sap.ui.require(["sap/ui/export/ExportUtils"], function(ExportUtils) {
 					var oProcessor = Promise.resolve();
@@ -1745,12 +1785,10 @@ sap.ui.define([
 							return oPropertyHelper.hasProperty(sPropertyName) ? oPropertyHelper.getProperty(sPropertyName).label : null;
 						}).then(function(oFilterConfig) {
 							if (oFilterConfig) {
-								mExportSettings.workbook.context = {
-									metaSheetName: oFilterConfig.name,
-									metainfo: [
-										oFilterConfig
-									]
-								};
+								var oContext = mExportSettings.workbook.context;
+
+								oContext.metaSheetName =  oFilterConfig.name;
+								oContext.metainfo = [oFilterConfig];
 							}
 						});
 					}
@@ -1795,10 +1833,11 @@ sap.ui.define([
 
 		this._loadExportLibrary().then(function() {
 			sap.ui.require(['sap/ui/export/ExportUtils'], function(ExportUtils) {
-				var bEnablePDFExport = new URL(window.location.href).search.indexOf("sap-ui-xx-enablePDFExport=true");
-				ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, that, undefined, bEnablePDFExport).then(function(oUserInput) {
-					that._cachedExportSettings = oUserInput;
-					that._onExport(oUserInput);
+				that.getControlDelegate().fetchExportCapabilities().then(function(oExportCapabilities) {
+					ExportUtils.getExportSettingsViaDialog(that._cachedExportSettings, oExportCapabilities, that).then(function(oUserInput) {
+						that._cachedExportSettings = oUserInput;
+						that._onExport(oUserInput);
+					});
 				});
 			});
 		});
@@ -2255,8 +2294,10 @@ sap.ui.define([
 			oColumn = this._oTable.removeColumn(oMDCColumn.getId() + "-innerColumn");
 			this._oTable.insertColumn(oColumn, iIndex);
 
-			// update template for ResponsiveTable
 			if (this._bMobileTable) {
+				// responsive table requires the column order to be updated.
+				this._setMobileColumnOrder();
+				// update template for ResponisveTable
 				this._updateColumnTemplate(oMDCColumn, iIndex);
 			}
 		}
@@ -2317,6 +2358,25 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Sets the column order for the responsive table. The order is set according to the index of the mdc columns.
+	 * Updating the responsive table's column order and invalidating avoid rebinds.
+	 * @private
+	 */
+	 Table.prototype._setMobileColumnOrder = function() {
+		this.getColumns().forEach(function(oMDCColumn) {
+			var oColumn = Core.byId(oMDCColumn.getId() + "-innerColumn");
+			if (!oColumn) {
+				return;
+			}
+			// since we ensure correct index of the mdcColumn control we can set the same order to the inner responsive table columns
+			oColumn.setOrder(this.indexOfColumn(oMDCColumn));
+		}, this);
+
+		// invalidate the inner table to apply the correct order on the UI. See sap.m.Column#setOrder
+		this._oTable.invalidate();
+	};
+
 	Table._removeItemCell = function(oItem, iRemoveIndex, iInsertIndex) {
 		// remove cell from index
 		var oCell = oItem.removeCell(iRemoveIndex);
@@ -2334,6 +2394,7 @@ sap.ui.define([
 		this.fireRowPress({
 			bindingContext: oEvent.getParameter("listItem").getBindingContext()
 		});
+		ResponsiveTableType._onRowActionPress.apply(this, [oEvent]);
 	};
 
 	Table.prototype._onSelectionChange = function(oEvent) {
@@ -2373,13 +2434,6 @@ sap.ui.define([
 		});
 	};
 
-	Table.prototype._onRowActionPress = function(oEvent) {
-		var oRow = oEvent.getParameter("row");
-		this.fireRowPress({
-			bindingContext: oRow.getBindingContext()
-		});
-	};
-
 	Table.prototype._onRowSelectionChange = function(oEvent) {
 		if (!this._bSelectionChangedByAPI) { // TODO Table / Plugin needs to ensure that events are only fired when "relevant" for the app.
 			this.fireSelectionChange({
@@ -2395,14 +2449,14 @@ sap.ui.define([
 		this._onColumnPress(oEvent.getParameter("column"));
 	};
 
-	// TODO: maybe selectedContexts should be an association
-	// TODO: The API is unstable/unreliable in GridTable scenarios and has to be worked upon
 	/**
-	 * Gets contexts from the table that have been selected by the user.
+	 * Gets contexts that have been selected by the user.
 	 *
-	 * @returns {Array} Contexts of rows/items selected by the user
+	 * @returns {sap.ui.model.Context[]} The selected contexts
 	 * @private
-	 * @experimental The API is unstable/unreliable in GridTable scenarios
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
+	 * @experimental The API is subject to change.
 	 */
 	Table.prototype.getSelectedContexts = function() {
 		if (this._oTable) {
@@ -2420,9 +2474,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * API to get clear selection from the table.
+	 * Clears the selection.
 	 *
 	 * @private
+	 * @ui5-restricted sap.fe
+	 * MDC_PUBLIC_CANDIDATE
 	 */
 	Table.prototype.clearSelection = function() {
 		if (this._oTable) {
@@ -2438,7 +2494,7 @@ sap.ui.define([
 
 	Table.prototype._registerInnerFilter = function(oFilter) {
 		oFilter.attachSearch(function() {
-			this.rebind();
+			this._rebind();
 		}, this);
 	};
 
@@ -2467,7 +2523,7 @@ sap.ui.define([
 
 		var oBindingInfo = {};
 
-		this.getControlDelegate().updateBindingInfo(this, this.getPayload(), oBindingInfo);
+		this.getControlDelegate().updateBindingInfo(this, oBindingInfo);
 
 		if (oBindingInfo.path) {
 			this._oTable.setShowOverlay(false);
@@ -2604,7 +2660,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Gets the row count of the table
+	 * Gets the row count of the table.
 	 *
 	 * @private
 	 * @returns {int} the row count
@@ -2619,8 +2675,7 @@ sap.ui.define([
 		var iRowCount;
 		if (!bConsiderTotal) {
 			iRowCount = oRowBinding.getLength();
-		} else {
-			if (typeof oRowBinding.getCount === 'function') {
+		} else if (typeof oRowBinding.getCount === 'function') {
 				iRowCount = oRowBinding.getCount();
 			} else if (oRowBinding.isLengthFinal()) {
 				// This branch is only fallback and for TreeBindings (TreeBindings should be excluded when MDCTable will support TreeBinding,
@@ -2628,7 +2683,6 @@ sap.ui.define([
 				// ListBindings should in general get a getCount function in nearer future (5341464)
 				iRowCount = oRowBinding.getLength();
 			}
-		}
 
 		if (iRowCount < 0 || iRowCount === "0") {
 			iRowCount = 0;
@@ -2689,20 +2743,15 @@ sap.ui.define([
 		}
 	};
 
-	// TODO: Delete!
-	Table.prototype.rebindTable = function() {
-		this.rebind();
-	};
-
 	/**
 	 * Rebinds the table rows.
 	 */
-	Table.prototype.rebind = function() {
+	Table.prototype._rebind = function() {
 		// Bind the rows/items of the table, only once it is initialized.
 		if (this._bFullyInitialized) {
 			this.bindRows();
 		} else {
-			this._fullyInitialized().then(this.rebind.bind(this));
+			this._fullyInitialized().then(this._rebind.bind(this));
 		}
 	};
 
@@ -2743,7 +2792,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Termination of the <code>MDCTable</code> control
+	 * Terminates the <code>MDCTable</code> control.
 	 * @private
 	 */
 	Table.prototype.exit = function() {