@openui5/sap.ui.mdc 1.108.2 → 1.110.0

package/src/sap/ui/mdc/table/GridTableType.js

@@ -1,16 +1,23 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
-	"./TableTypeBase", "../library"
-], function(TableTypeBase, library) {
+	"./TableTypeBase",
+	"../library",
+	"sap/ui/core/library"
+], function(
+	TableTypeBase,
+	library,
+	coreLibrary
+) {
 	"use strict";
 
 	var InnerTable, InnerColumn, InnerRowAction, InnerRowActionItem, InnerMultiSelectionPlugin, InnerFixedRowMode, InnerAutoRowMode, InnerRowSettings;
 	var RowCountMode = library.RowCountMode;
+	var SortOrder = coreLibrary.SortOrder;
 
 	/**
 	 * Constructor for a new <code>GridTableType</code>.
@@ -23,11 +30,10 @@ sap.ui.define([
 	 * @private
 	 * @experimental
 	 * @ui5-restricted sap.fe
-	 * MDC_PUBLIC_CANDIDATE
+	 * @MDC_PUBLIC_CANDIDATE
 	 * @since 1.65
 	 * @alias sap.ui.mdc.table.GridTableType
 	 */
-
 	var GridTableType = TableTypeBase.extend("sap.ui.mdc.table.GridTableType", {
 		metadata: {
 			library: "sap.ui.mdc",
@@ -53,28 +59,36 @@ sap.ui.define([
 				 * Accepts positive integer values. If set to 0, the selection limit is disabled, and the Select All checkbox appears instead of the
 				 * Deselect All button.
 				 */
-				selectionLimit : {
-					type : "int",
-					defaultValue : 200
+				selectionLimit: {
+					type: "int",
+					defaultValue: 200
 				},
 				/**
 				 * Determines whether the header selector is shown.
 				 */
-				showHeaderSelector : {
-					type : "boolean",
-					defaultValue : true
+				showHeaderSelector: {
+					type: "boolean",
+					defaultValue: true
 				}
 			}
 		}
 	});
 
-	GridTableType.prototype.updateRelevantTableProperty = function(oTable, sProperty, vValue) {
-		if (!oTable || !oTable.isA("sap.ui.table.Table")) {
+	GridTableType.prototype.exit = function() {
+		TableTypeBase.prototype.exit.apply(this, arguments);
+		this.disableColumnResize();
+	};
+
+	GridTableType.prototype.updateTableByProperty = function(sProperty, vValue) {
+		var oGridTable = this.getInnerTable();
+		var oMultiSelectionPlugin = this._getMultiSelectionPlugin();
+
+		if (!oGridTable) {
 			return;
 		}
 
 		if (sProperty === "rowCountMode") {
-			var oRowMode = oTable.getRowMode();
+			var oRowMode = oGridTable.getRowMode();
 			var bHideEmptyRows = false;
 
 			if (oRowMode && (vValue === RowCountMode.Fixed && !oRowMode.isA("sap.ui.table.rowmodes.FixedRowMode") ||
@@ -86,148 +100,256 @@ sap.ui.define([
 
 			if (!oRowMode) {
 				var RowMode = vValue === RowCountMode.Fixed ? InnerFixedRowMode : InnerAutoRowMode;
-				oTable.setRowMode(new RowMode({
+				oGridTable.setRowMode(new RowMode({
 					hideEmptyRows: bHideEmptyRows
 				}));
 			}
 
-			this._updateTableRowCount(oTable, vValue, this.getRowCount());
+			this._updateTableRowCount();
 		} else if (sProperty === "rowCount") {
-			this._updateTableRowCount(oTable, this.getRowCountMode(), vValue);
+			this._updateTableRowCount();
 		} else if (sProperty === "selectionLimit") {
-			oTable.getPlugins()[0].setLimit(vValue).setEnableNotification(vValue > 0);
+			if (oMultiSelectionPlugin) {
+				oMultiSelectionPlugin.setLimit(vValue).setEnableNotification(vValue > 0);
+			}
 		} else if (sProperty === "showHeaderSelector") {
-			oTable.getPlugins()[0].setShowHeaderSelector(vValue);
+			if (oMultiSelectionPlugin) {
+				oMultiSelectionPlugin.setShowHeaderSelector(vValue);
+			}
 		}
 	};
 
-	GridTableType.prototype._updateTableRowCount = function(oTable, sMode, iValue) {
-		if (sMode === RowCountMode.Fixed) {
-			oTable.getRowMode().setRowCount(iValue);
-		} else {
-			oTable.getRowMode().setMinRowCount(iValue);
-		}
-	};
+	GridTableType.prototype._updateTableRowCount = function() {
+		var oGridTable = this.getInnerTable();
 
-	GridTableType.updateDefault = function(oTable) {
-		if (oTable) {
-			oTable.setRowMode(new InnerAutoRowMode({
-				minRowCount: 10 // default in this class
-			}));
+		if (this.getRowCountMode() === RowCountMode.Fixed) {
+			oGridTable.getRowMode().setRowCount(this.getRowCount());
+		} else {
+			oGridTable.getRowMode().setMinRowCount(this.getRowCount());
 		}
 	};
 
-	/* Below APIs are used during table creation */
-
-	GridTableType.loadGridTableLib = function() {
+	GridTableType.prototype.loadUiTableLibrary = function() {
 		if (!this._oGridTableLibLoaded) {
 			this._oGridTableLibLoaded = sap.ui.getCore().loadLibrary("sap.ui.table", true);
 		}
 		return this._oGridTableLibLoaded;
 	};
 
-	GridTableType.loadTableModules = function() {
-		if (!InnerTable) {
+	GridTableType.prototype.loadModules = function() {
+		if (InnerTable) {
+			return Promise.resolve();
+		}
+
+		return this.loadUiTableLibrary().then(function() {
 			return new Promise(function(resolve, reject) {
-				this.loadGridTableLib().then(function() {
-					sap.ui.require([
-						"sap/ui/table/Table", "sap/ui/table/Column", "sap/ui/table/RowAction", "sap/ui/table/RowActionItem", "sap/ui/table/plugins/MultiSelectionPlugin",
-						"sap/ui/table/rowmodes/FixedRowMode", "sap/ui/table/rowmodes/AutoRowMode", "sap/ui/table/RowSettings"
-					], function(GridTable, GridColumn, RowAction, RowActionItem, MultiSelectionPlugin, FixedRowMode, AutoRowMode, RowSettings) {
-						InnerTable = GridTable;
-						InnerColumn = GridColumn;
-						InnerRowAction = RowAction;
-						InnerRowActionItem = RowActionItem;
-						InnerMultiSelectionPlugin = MultiSelectionPlugin;
-						InnerFixedRowMode = FixedRowMode;
-						InnerAutoRowMode = AutoRowMode;
-						InnerRowSettings = RowSettings;
-						resolve();
-					}, function() {
-						reject("Failed to load some modules");
-					});
+				sap.ui.require([
+					"sap/ui/table/Table", "sap/ui/table/Column", "sap/ui/table/RowAction", "sap/ui/table/RowActionItem",
+					"sap/ui/table/plugins/MultiSelectionPlugin",
+					"sap/ui/table/rowmodes/FixedRowMode", "sap/ui/table/rowmodes/AutoRowMode", "sap/ui/table/RowSettings"
+				], function(GridTable, GridColumn, RowAction, RowActionItem, MultiSelectionPlugin, FixedRowMode, AutoRowMode, RowSettings) {
+					InnerTable = GridTable;
+					InnerColumn = GridColumn;
+					InnerRowAction = RowAction;
+					InnerRowActionItem = RowActionItem;
+					InnerMultiSelectionPlugin = MultiSelectionPlugin;
+					InnerFixedRowMode = FixedRowMode;
+					InnerAutoRowMode = AutoRowMode;
+					InnerRowSettings = RowSettings;
+					resolve();
+				}, function() {
+					reject("Failed to load some modules");
 				});
-			}.bind(this));
-		} else {
-			return Promise.resolve();
+			});
+		});
+	};
+
+	GridTableType.prototype.createTable = function(sId) {
+		var oTable = this.getTable();
+
+		if (!oTable || !InnerTable) {
+			return null;
 		}
+
+		return new InnerTable(sId, this.getTableSettings());
+	};
+
+	GridTableType.prototype.getTableSettings = function() {
+		var oTable = this.getTable();
+
+		return Object.assign({}, TableTypeBase.prototype.getTableSettings.apply(this, arguments), {
+			enableBusyIndicator: true,
+			enableColumnReordering: false,
+			threshold: this.getThreshold(),
+			cellClick: [this._onCellClick, this],
+			noData: oTable._getNoDataText(),
+			extension: [oTable._oToolbar],
+			ariaLabelledBy: [oTable._oTitle],
+			plugins: [this._createSelectionPlugin()],
+			columnSelect: [this._onColumnPress, this],
+			rowSettingsTemplate: this.getRowSettingsConfig(),
+			selectionBehavior: this._getSelectionBehavior()
+		});
+	};
+
+	GridTableType.prototype._onCellClick = function(oEvent) {
+		this.callHook("RowPress", this.getTable(), {
+			bindingContext: oEvent.getParameter("rowBindingContext")
+		});
 	};
 
-	GridTableType.createTable = function(sId, mSettings) {
-		return new InnerTable(sId, mSettings);
+	GridTableType.prototype._onSelectionChange = function(oEvent) {
+		this.callHook("SelectionChange", this.getTable(), {
+			bindingContext: oEvent.getParameter("rowContext"),
+			selected: oEvent.getSource().isIndexSelected(oEvent.getParameter("rowIndex")),
+			selectAll: oEvent.getParameter("selectAll")
+		});
+	};
+
+	GridTableType.prototype._onColumnPress = function(oEvent) {
+		var oTable = this.getTable();
+
+		oEvent.preventDefault();
+		this.callHook("ColumnPress", this.getTable(), {
+			column: oTable.getColumns()[oEvent.getParameter("column").getIndex()]
+		});
 	};
 
 	GridTableType.createColumn = function(sId, mSettings) {
 		var oColumn = new InnerColumn(sId, mSettings);
 		/* **** Ensure that the columnSelect event is fired always (esp. mobile) **** */
-		oColumn.attachColumnMenuOpen(function(oEvent){ oEvent.preventDefault(); });
+		oColumn.attachColumnMenuOpen(function(oEvent) { oEvent.preventDefault(); });
 		oColumn._menuHasItems = function() { return true; };
 		/* **** */
 		return oColumn;
 	};
 
-	GridTableType.createMultiSelectionPlugin = function(oTable, aEventInfo) {
-		return new InnerMultiSelectionPlugin(oTable.getId() + "--multiSelectPlugin", {
-			selectionMode: TableTypeBase.getSelectionMode(oTable),
-			selectionChange: aEventInfo
+	GridTableType.prototype._createSelectionPlugin = function() {
+		return new InnerMultiSelectionPlugin({
+			selectionMode: this._getSelectionMode(),
+			selectionChange: [this._onSelectionChange, this]
 		});
 	};
 
-	GridTableType.enableColumnResizer = function(oTable, oInnerTable) {
-		oInnerTable.getColumns().forEach(function(oColumn) {
+	GridTableType.prototype._getMultiSelectionPlugin = function() {
+		var oGridTable = this.getInnerTable();
+		var oPlugin = oGridTable ? oGridTable.getPlugins()[0] : undefined;
+		return oPlugin && oPlugin.isA("sap.ui.table.plugins.MultiSelectionPlugin") ? oPlugin : null;
+	};
+
+	GridTableType.prototype.enableColumnResize = function() {
+		var oTable = this.getTable();
+		var oGridTable = this.getInnerTable();
+
+		if (!oTable || !oGridTable) {
+			return;
+		}
+
+		oGridTable.getColumns().forEach(function(oColumn) {
 			oColumn.setResizable(true);
 			oColumn.setAutoResizable(true);
 		});
-
-		oInnerTable.detachColumnResize(oTable._onColumnResize, oTable);
-		oInnerTable.attachColumnResize(oTable._onColumnResize, oTable);
+		oGridTable.detachColumnResize(this._onColumnResize, this);
+		oGridTable.attachColumnResize(this._onColumnResize, this);
 	};
 
-	GridTableType.disableColumnResizer = function(oTable, oInnerTable) {
-		oInnerTable.getColumns().forEach(function(oColumn) {
+	GridTableType.prototype.disableColumnResize = function() {
+		var oTable = this.getTable();
+		var oGridTable = this.getInnerTable();
+
+		if (!oTable || !oGridTable) {
+			return;
+		}
+
+		oGridTable.getColumns().forEach(function(oColumn) {
 			oColumn.setResizable(false);
 			oColumn.setAutoResizable(false);
 		});
+		oGridTable.detachColumnResize(this._onColumnResize, this);
+	};
 
-		oInnerTable.detachColumnResize(oTable._onColumnResize, oTable);
+	GridTableType.prototype._onColumnResize = function(oEvent) {
+		var oTable = this.getTable();
+		var oGridTable = this.getInnerTable();
+		var oGridTableColumn = oEvent.getParameter("column");
+		var sWidth = oEvent.getParameter("width");
+		var iIndex = oGridTable.indexOfColumn(oGridTableColumn);
+		var oColumn = oTable.getColumns()[iIndex];
+
+		this.callHook("ColumnResize", oTable, {
+			column: oColumn,
+			width: sWidth
+		});
 	};
 
-	GridTableType.updateSelection = function(oTable) {
-		var sSelectionMode = TableTypeBase.getSelectionMode(oTable);
-		if (oTable.getSelectionMode() === library.SelectionMode.SingleMaster) {
-			oTable._oTable.setSelectionBehavior("RowOnly");
-		} else {
-			oTable._oTable.resetProperty("selectionBehavior");
-		}
-		oTable._oTable.getPlugins()[0].setSelectionMode(sSelectionMode);
+	GridTableType.prototype._getSelectionMode = function() {
+		var oTable = this.getTable();
+		var sSelectionMode = oTable ? oTable.getSelectionMode() : undefined;
+		var mSelectionModeMap = {
+			Single: "Single",
+			SingleMaster: "Single",
+			Multi: "MultiToggle",
+			None: "None",
+			undefined: "None"
+		};
+
+		return mSelectionModeMap[sSelectionMode];
 	};
 
-	GridTableType.removeRowActions = function(oTable) {
-		var oInnerRowAction = oTable._oTable.getRowActionTemplate();
-		if (oInnerRowAction) {
-			oInnerRowAction.destroy();
+	GridTableType.prototype._getSelectionBehavior = function() {
+		var oTable = this.getTable();
+		var mSelectionBehaviorMap = {
+			SingleMaster: "RowOnly"
+		};
+
+		return mSelectionBehaviorMap[oTable ? oTable.getSelectionMode() : undefined];
+	};
+
+	GridTableType.prototype.updateSelectionSettings = function() {
+		var oTable = this.getTable();
+		var oGridTable = this.getInnerTable();
+		var oMultiSelectionPlugin = this._getMultiSelectionPlugin();
+
+		if (!oTable || !oGridTable) {
+			return;
+		}
+
+		oGridTable.setSelectionBehavior(this._getSelectionBehavior());
+
+		if (oMultiSelectionPlugin) {
+			oMultiSelectionPlugin.setSelectionMode(this._getSelectionMode());
 		}
-		oTable._oTable.setRowActionTemplate();
-		oTable._oTable.setRowActionCount();
 	};
 
-	GridTableType.updateRowSettings = function(oTable, oRowSettings, fnRowActionPress) {
-		var oInnerRowSettings = new InnerRowSettings(undefined, oRowSettings.getAllSettings());
-		this.updateRowActions(oTable.getParent(), oRowSettings, fnRowActionPress);
-		oTable.getRowSettingsTemplate().destroy();
-		oTable.setRowSettingsTemplate(oInnerRowSettings);
+	GridTableType.prototype.updateRowSettings = function() {
+		var oGridTable = this.getInnerTable();
+
+		if (!oGridTable) {
+			return;
+		}
+
+		oGridTable.destroyRowSettingsTemplate();
+		oGridTable.setRowSettingsTemplate(new InnerRowSettings(this.getRowSettingsConfig()));
+		this.updateRowActions();
 	};
 
-	GridTableType.updateRowActions = function (oTable, oRowSettings) {
-		this.removeRowActions(oTable);
-		if (!oRowSettings) {
+	GridTableType.prototype.updateRowActions = function() {
+		var oGridTable = this.getInnerTable();
+
+		if (!oGridTable) {
 			return;
 		}
-		if (!oRowSettings.isBound("rowActions") && (!oRowSettings.getRowActions() || oRowSettings.getRowActions().length == 0)) {
+
+		var oRowSettings = this.getTable().getRowSettings();
+
+		this._removeRowActions();
+
+		if (!oRowSettings || !oRowSettings.isBound("rowActions") && (!oRowSettings.getRowActions() || oRowSettings.getRowActions().length == 0)) {
 			return;
 		}
 
 		var oRowActions = oRowSettings.getAllActions();
+
 		if ("templateInfo" in oRowActions) {
 			var oTemplateInfo = oRowActions.templateInfo;
 			// Set template for inner row actions using temporary metadata
@@ -236,18 +358,18 @@ sap.ui.define([
 				visible: oTemplateInfo.visible,
 				icon: oTemplateInfo.icon,
 				text: oTemplateInfo.text,
-				press: [this._onRowActionPress, oTable]
+				press: [this._onRowActionPress, this]
 			});
 			// Remove temporary metadata from row actions object
 			delete oRowActions.templateInfo;
 		} else {
-			oRowActions.items = oRowActions.items.map(function (oRowActionItem) {
+			oRowActions.items = oRowActions.items.map(function(oRowActionItem) {
 				var oInnerRowActionItem = new InnerRowActionItem({
 					type: oRowActionItem.isBound("type") ? oRowActionItem.getBindingInfo("type") : oRowActionItem.getType(),
 					visible: oRowActionItem.isBound("visible") ? oRowActionItem.getBindingInfo("visible") : oRowActionItem.getVisible(),
 					icon: oRowActionItem.isBound("icon") ? oRowActionItem.getBindingInfo("icon") : oRowActionItem._getIcon(),
 					text: oRowActionItem.isBound("text") ? oRowActionItem.getBindingInfo("text") : oRowActionItem._getText(),
-					press: [this._onRowActionPress, oTable]
+					press: [this._onRowActionPress, this]
 				});
 				// Add custom data for MDC row action, so original is retrievable from inner row action item
 				oInnerRowActionItem.data("rowAction", oRowActionItem);
@@ -255,16 +377,29 @@ sap.ui.define([
 			}, this);
 		}
 
-		var oInnerRowAction = new InnerRowAction(oTable.getId() + "--rowAction", oRowActions);
-		oTable._oTable.setRowActionTemplate(oInnerRowAction);
-		oTable._oTable.setRowActionCount(oRowSettings.getRowActionCount());
+		oGridTable.setRowActionTemplate(new InnerRowAction(oRowActions));
+		oGridTable.setRowActionCount(oRowSettings.getRowActionCount());
 	};
 
-	GridTableType._onRowActionPress = function (oEvent) {
+	GridTableType.prototype._removeRowActions = function() {
+		var oGridTable = this.getInnerTable();
+		var oInnerRowAction = oGridTable.getRowActionTemplate();
+
+		if (oInnerRowAction) {
+			oInnerRowAction.destroy();
+		}
+
+		oGridTable.setRowActionTemplate();
+		oGridTable.setRowActionCount();
+	};
+
+	GridTableType.prototype._onRowActionPress = function(oEvent) {
+		var oTable = this.getTable();
 		var oInnerRowActionItem = oEvent.getParameter("item");
-		var oRowActionsInfo = this.getRowSettings().getAllActions();
+		var oRowSettings = oTable.getRowSettings();
+		var oRowActionsInfo = oRowSettings.getAllActions();
 
-		if (this.getRowSettings().isBound("rowActions")) {
+		if (oRowSettings.isBound("rowActions")) {
 			var sActionModel = oRowActionsInfo.items.model;
 			var oActionContext = oInnerRowActionItem.getBindingContext(sActionModel);
 
@@ -276,15 +411,104 @@ sap.ui.define([
 
 			// Set model for row settings, as it is not propagated
 			this._oRowActionItem.setModel(this.getModel(sActionModel), sActionModel);
-			this.getRowSettings().addDependent(this._oRowActionItem);
+			oRowSettings.addDependent(this._oRowActionItem);
 		} else {
 			this._oRowActionItem = oInnerRowActionItem.data("rowAction");
 		}
-		var oRow = oEvent.getParameter("row");
-		this._oRowActionItem.firePress({
-			bindingContext: oRow.getBindingContext()
+
+		this.callHook("Press", this._oRowActionItem, {
+			bindingContext: oEvent.getParameter("row").getBindingContext()
+		});
+	};
+
+	GridTableType.prototype.removeToolbar = function() {
+		var oGridTable = this.getInnerTable();
+
+		if (oGridTable) {
+			oGridTable.removeExtension(this.getTable()._oToolbar);
+		}
+	};
+
+	GridTableType.prototype.scrollToIndex = function(iIndex) {
+		var oTable = this.getTable();
+		var oGridTable = this.getInnerTable();
+
+		if (!oGridTable) {
+			return Promise.reject();
+		}
+
+		return new Promise(function(resolve) {
+			if (iIndex === -1) {
+				iIndex = oTable._getRowCount(false);
+			}
+
+			if (oGridTable._setFirstVisibleRowIndex(iIndex)) {
+				oGridTable.attachEventOnce("rowsUpdated", function() {
+					resolve();
+				});
+			} else {
+				resolve();
+			}
 		});
 	};
 
+	GridTableType.prototype.getRowBinding = function() {
+		var oGridTable = this.getInnerTable();
+		return oGridTable ? oGridTable.getBinding() : undefined;
+	};
+
+	GridTableType.prototype.bindRows = function(oBindingInfo) {
+		var oGridTable = this.getInnerTable();
+
+		if (oGridTable) {
+			oGridTable.bindRows(oBindingInfo);
+		}
+	};
+
+	GridTableType.prototype.isTableBound = function() {
+		var oGridTable = this.getInnerTable();
+		return oGridTable ? oGridTable.isBound("rows") : false;
+	};
+
+	GridTableType.prototype.insertFilterInfoBar = function(oFilterInfoBar, sAriaLabelId) {
+		var oGridTable = this.getInnerTable();
+
+		if (oGridTable) {
+			oGridTable.insertExtension(oFilterInfoBar, 1);
+
+			if (!oGridTable.getAriaLabelledBy().includes(sAriaLabelId)) {
+				oGridTable.addAriaLabelledBy(sAriaLabelId);
+			}
+		}
+	};
+
+	GridTableType.prototype.updateSortIndicator = function(oColumn, sSortOrder) {
+		var oGridColumn = oColumn.getInnerColumn();
+
+		oGridColumn.setSorted(sSortOrder !== SortOrder.None);
+		oGridColumn.setSortOrder(sSortOrder === SortOrder.None ? undefined : sSortOrder);
+	};
+
+	GridTableType.prototype.getSelectedContexts = function() {
+		var oGridTable = this.getInnerTable();
+		var oMultiSelectionPlugin = this._getMultiSelectionPlugin();
+
+		if (!oMultiSelectionPlugin) {
+			return [];
+		}
+
+		return oMultiSelectionPlugin.getSelectedIndices().map(function(iIndex) {
+			return oGridTable.getContextByIndex(iIndex);
+		}, this);
+	};
+
+	GridTableType.prototype.clearSelection = function() {
+		var oMultiSelectionPlugin = this._getMultiSelectionPlugin();
+
+		if (oMultiSelectionPlugin) {
+			oMultiSelectionPlugin.clearSelection();
+		}
+	};
+
 	return GridTableType;
 });

package/src/sap/ui/mdc/table/PropertyHelper.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @private
 	 * @experimental
 	 * @ui5-restricted sap.fe
-	 * MDC_PUBLIC_CANDIDATE
+	 * @MDC_PUBLIC_CANDIDATE
 	 */
 
 	/**
@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @private
 	 * @experimental
@@ -353,26 +353,32 @@ sap.ui.define([
 			return null;
 		}
 
-		return this._calcColumnWidth(oProperty, oMDCColumn.getHeader());
+		return this._calcColumnWidth(oProperty, oMDCColumn);
 	};
 
 	/**
 	 * Calculates the column width based on the provided <code>PropertyInfo</code>.
 	 *
 	 * @param {sap.ui.mdc.table.PropertyInfo} oProperty The property of the <code>Column</code> instance for which to set the width
-	 * @param {string} [sHeader] The header in case of it is different than the PropertyInfo header
+	 * @param {sap.ui.mdc.table.Column} oMDCColumn The <code>Column</code> instance for which the width is calculated
 	 * @return {string} The calculated column width
 	 * @since 1.95
 	 * @private
 	 */
-	 PropertyHelper.prototype._calcColumnWidth = function (oProperty, sHeader) {
+	 PropertyHelper.prototype._calcColumnWidth = function (oProperty, oMDCColumn) {
 		var mWidthCalculation = Object.assign({
 			gap: 0,
 			includeLabel: true,
 			truncateLabel: true,
-			excludeProperties: []
+			excludeProperties: [],
+			required: oMDCColumn.getRequired()
 		}, oProperty.visualSettings && oProperty.visualSettings.widthCalculation);
 
+		var oMDCTable = oMDCColumn.getParent();
+		if (oMDCTable && oMDCTable._isOfType("TreeTable") && oMDCTable.indexOfColumn(oMDCColumn) == 0) {
+			mWidthCalculation.treeColumn = true;
+		}
+
 		var aTypes = [];
 		if (oProperty.isComplex()) {
 			// for complex properties generate [<TypeInstance>, <TypeSettings>][] structure
@@ -392,7 +398,7 @@ sap.ui.define([
 			mWidthCalculation.gap += 2.5;
 		}
 
-		sHeader = (mWidthCalculation.includeLabel) ? sHeader || oProperty.label : "";
+		var sHeader = (mWidthCalculation.includeLabel) ? oMDCColumn.getHeader() || oProperty.label : "";
 		return TableUtil.calcColumnWidth(aTypes, sHeader, mWidthCalculation);
 	};