@openui5/sap.ui.mdc 1.141.2 → 1.143.0

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

@@ -0,0 +1,47 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides control sap.ui.mdc.ActionLayoutData.
+sap.ui.define(["sap/m/OverflowToolbarLayoutData", "sap/ui/mdc/enums/TableActionPosition"],
+	(OverflowToolbarLayoutData, TableActionPosition) => {
+	"use strict";
+
+	/**
+	 * Constructor for a new <code>ActionLayoutData</code>.
+	 *
+	 * @param {string} [sId] ID for the new layout data, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new layout data
+	 *
+	 * @class
+	 * Defines the layout data for the {@link sap.ui.mdc.Table#getActions actions} and {@link sap.ui.mdc.Table#getTableActions tableActions}
+	 * of the {@link sap.ui.mdc.Table Table}.
+	 *
+	 * @extends sap.m.OverflowToolbarLayoutData
+	 * @implements sap.ui.mdc.IActionLayoutData
+	 * @version 1.143.0
+	 * @constructor
+	 * @public
+	 * @since 1.143
+	 * @alias sap.ui.mdc.table.ActionLayoutData
+	 */
+	const ActionLayoutData = OverflowToolbarLayoutData.extend("sap.ui.mdc.table.ActionLayoutData", {
+		metadata: {
+			library: "sap.ui.mdc",
+			interfaces: [
+				"sap.ui.mdc.IActionLayoutData"
+			],
+			properties: {
+				/**
+				 * Defines the position of the action within the group of table actions.
+				 */
+				position: {type: "sap.ui.mdc.enums.TableActionPosition", group: "Misc", defaultValue: TableActionPosition.EndActions}
+			}
+		}
+	});
+
+	return ActionLayoutData;
+
+});

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

@@ -5,31 +5,21 @@
  */
 
 sap.ui.define([
-	"./GridTableType",
-	"./ResponsiveTableType",
-	"sap/base/Log",
-	"sap/m/library",
 	"sap/m/Label",
-	"sap/ui/core/Element",
-	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/base/ManagedObjectModel",
 	"sap/ui/model/BindingMode",
+	"sap/m/plugins/PluginBase",
+	"sap/ui/core/Element",
 	"sap/ui/core/Control",
-	"sap/ui/mdc/enums/TableType",
-	"sap/m/plugins/PluginBase"
+	"sap/base/Log"
 ], (
-	GridTableType,
-	ResponsiveTableType,
-	Log,
-	MLibrary,
 	Label,
-	Element,
-	JSONModel,
 	ManagedObjectModel,
 	BindingMode,
+	PluginBase,
+	Element,
 	Control,
-	TableType,
-	PluginBase
+	Log
 ) => {
 	"use strict";
 
@@ -205,9 +195,7 @@ sap.ui.define([
 			creationTemplate: true
 		};
 
-		this._oManagedObjectModel = new ManagedObjectModel(this);
-		this._oSettingsModel = new JSONModel({
-			width: this.getWidth(),
+		this._oManagedObjectModel = new ManagedObjectModel(this, {
 			calculatedWidth: null,
 			p13nWidth: null
 		});
@@ -223,107 +211,16 @@ sap.ui.define([
 		const oTable = this.getTable();
 
 		if (oTable && (!this._oInnerColumn || this._oInnerColumn.isDestroyed())) {
-			this._oInnerColumn = this._createInnerColumn();
+			this._oInnerColumn = oTable._getType().createColumn(this);
+			// XConfig might not have been available on init - depends on the order settings are applied in Table#applySettings.
+			this._readP13nValues();
+			this._oInnerColumn.setModel(this._oManagedObjectModel, "$sap.ui.mdc.table.Column");
+			this._oInnerColumnReady.resolve();
 		}
 
 		return this._oInnerColumn;
 	};
 
-	Column.prototype._createInnerColumn = function() {
-		const oTable = this.getTable();
-		let oColumn;
-
-		const oWidthBindingInfo = {
-			parts: [
-				{path: "$this>/width"}, {path: "$columnSettings>/calculatedWidth"}, {path: "$columnSettings>/p13nWidth"}
-			],
-			formatter: function(sWidth, sCalculatedWidth, sP13nWidth) {
-				return sP13nWidth || sCalculatedWidth || sWidth;
-			}
-		};
-
-		const oTooltipBindingInfo = {
-			parts: [
-				{path: "$this>/tooltip"},
-				{path: "$this>/header"},
-				{path: "$this>/headerVisible"},
-				{path: "$sap.ui.mdc.Table>/useColumnLabelsAsTooltips"}
-			],
-			formatter: function(sTooltip, sHeader, bHeaderVisible, bUseColumnLabelsAsTooltips) {
-				if (sTooltip || !bUseColumnLabelsAsTooltips) {
-					return sTooltip;
-				}
-				return bHeaderVisible ? sHeader : "";
-			}
-		};
-
-		this._readP13nValues(); // XConfig might not have been available on init - depends on the order settings are applied in Table#applySettings.
-
-		if (oTable._isOfType(TableType.ResponsiveTable)) {
-			oColumn = ResponsiveTableType.createColumn(this.getId() + "-innerColumn", {
-				width: oWidthBindingInfo,
-				autoPopinWidth: "{$this>/minWidth}",
-				hAlign: "{$this>/hAlign}",
-				header: this._getColumnHeaderLabel(oTooltipBindingInfo),
-				importance: {
-					parts: [
-						{path: "$this>/importance"}, {path: "$this>/extendedSettings/importance"}, {path: "$this>/extendedSettings/@className"}
-					],
-					formatter: function(sLegacyImportance, sImportance, sClassName) {
-						if (sImportance && sClassName === "sap.ui.mdc.table.ResponsiveColumnSettings") {
-							return sImportance;
-						} else {
-							return sLegacyImportance;
-						}
-					}
-				},
-				popinDisplay: "{= ${$this>/headerVisible} ? 'Inline' : 'WithoutHeader' }",
-				mergeDuplicates: {
-					parts: [
-						{path: "$this>/extendedSettings/mergeFunction"}, {path: "$this>/extendedSettings/@className"}
-					],
-					formatter: function(sMergeFunction, sClassName) {
-						return sMergeFunction && sClassName === "sap.ui.mdc.table.ResponsiveColumnSettings";
-					}
-				},
-				mergeFunctionName: {
-					parts: [
-						{path: "$this>/extendedSettings/mergeFunction"}, {path: "$this>/extendedSettings/@className"}
-					],
-					formatter: function(sMergeFunction, sClassName) {
-						if (sClassName === "sap.ui.mdc.table.ResponsiveColumnSettings") {
-							return sMergeFunction;
-						}
-					}
-				}
-			});
-		} else {
-			oColumn = GridTableType.createColumn(this.getId() + "-innerColumn", {
-				width: oWidthBindingInfo,
-				minWidth: {
-					path: "$this>/minWidth",
-					formatter: function(fMinWidth) {
-						return Math.round(fMinWidth * parseFloat(MLibrary.BaseFontSize));
-					}
-				},
-				hAlign: "{$this>/hAlign}",
-				label: this._getColumnHeaderLabel(),
-				resizable: "{$sap.ui.mdc.Table>/enableColumnResize}",
-				autoResizable: "{$sap.ui.mdc.Table>/enableColumnResize}",
-				tooltip: oTooltipBindingInfo,
-				template: this.getTemplateClone()
-			});
-			oColumn.setCreationTemplate(this.getCreationTemplateClone());
-		}
-
-		oColumn.setModel(this._oManagedObjectModel, "$this");
-		oColumn.setModel(this._oSettingsModel, "$columnSettings");
-		oColumn.setHeaderMenu(oTable.getId() + "-columnHeaderMenu");
-
-		this._oInnerColumnReady.resolve();
-		return oColumn;
-	};
-
 	// The purpose of this control is to render the MDC column in the inner table column header, for example to support tools that allow the user to
 	// select controls on the UI for editing.
 	const ColumnHeaderLabel = Control.extend("sap.ui.mdc.table.ColumnHeaderLabel", {
@@ -347,103 +244,62 @@ sap.ui.define([
 				oRm.close("div");
 			}
 		},
-		setIsInColumnHeaderContext: function(bIsInColumnHeaderContext) {
-			this.getLabel()?.setIsInColumnHeaderContext(bIsInColumnHeaderContext);
-		},
 		getText: function() { // Used by inner table for the fieldHelpInfo, and by tests in MDC and FE.
-			return this.getLabel().getText();
+			return this.getLabel()?.getText();
 		},
 		clone: function() { // For ResponsiveTable popin.
-			return this.getLabel().clone();
+			return this.getLabel()?.clone();
 		},
 		// Used by inner table for accessibility support.
 		getRequired: function() {
-			return this.getLabel().getRequired();
+			return this.getLabel()?.getRequired();
 		},
 		getAccessibilityInfo: function() {
-			return this.getLabel().getAccessibilityInfo();
+			return this.getLabel()?.getAccessibilityInfo();
+		},
+		setIsInColumnHeaderContext: function(bIsInColumnHeaderContext) {
+			this.getLabel()?.setIsInColumnHeaderContext(bIsInColumnHeaderContext);
 		}
 	});
 
 	/**
-	 * Creates and returns the column header control.
+	 * Creates and returns the column header control. If the control is already created, the existing instance is returned. The settings are not
+	 * updated. To create a new instance with new settings, first destroy the old instance.
 	 * If <code>headerVisible=false</code> then <code>width=0px</code> is applied to the <code>sap.m.Label</code> control for accessibility purposes.
 	 *
-	 * @param {object} oTooltipBindingInfo The binding info to be usd for the tooltip of the created column header control.
-	 *
-	 * @returns {object} The column header control
+	 * @param {object} [mLabelSettings] Additional settings for the inner <code>sap.m.Label</code>
+	 * @returns {sap.ui.mdc.table.ColumnHeaderLabel} The column header control
 	 * @private
 	 */
-	Column.prototype._getColumnHeaderLabel = function(oTooltipBindingInfo) {
-		const oTable = this.getTable();
-
-		if (oTable && (!this._oColumnHeaderLabel || this._oColumnHeaderLabel.isDestroyed())) {
-			this._oColumnHeaderLabel = new ColumnHeaderLabel({
-				column: this,
-				label: new Label({
-					width: "{= ${$this>/headerVisible} ? '100%' : '0px' }",
-					text: "{$this>/header}",
-					textAlign: "{$this>/hAlign}",
-					tooltip: oTooltipBindingInfo ? oTooltipBindingInfo : "",
-					wrapping: {
-						parts: [
-							{path: "$this>/headerVisible"}, {path: "$sap.ui.mdc.Table>/enableColumnResize"}
-						],
-						formatter: function(bHeaderVisible, bResizable) {
-							return oTable._isOfType(TableType.ResponsiveTable) && bHeaderVisible && !bResizable;
-						}
-					},
-					wrappingType: oTable._isOfType(TableType.ResponsiveTable) ? "Hyphenated" : null,
-					required: "{$this>/required}"
-				})
-			});
+	Column.prototype.getHeaderLabel = function(mLabelSettings) {
+		if (this._oColumnHeaderLabel?.isDestroyed()) {
+			delete this._oColumnHeaderLabel;
 		}
 
+		this._oColumnHeaderLabel ??= new ColumnHeaderLabel({
+			column: this,
+			label: new Label({
+				width: "{= ${$sap.ui.mdc.table.Column>/headerVisible} ? '100%' : '0px' }",
+				text: "{$sap.ui.mdc.table.Column>/header}",
+				textAlign: "{$sap.ui.mdc.table.Column>/hAlign}",
+				required: "{$sap.ui.mdc.table.Column>/required}",
+				...mLabelSettings
+			})
+		});
+
 		return this._oColumnHeaderLabel;
 	};
 
 	Column.prototype.getTemplateClone = function() {
-		const oTable = this.getTable();
 		const oTemplate = this.getTemplate();
 
-		if (oTable && oTemplate && (!this._oTemplateClone || this._oTemplateClone.isDestroyed())) {
+		if (oTemplate && (!this._oTemplateClone || this._oTemplateClone.isDestroyed())) {
 			this._oTemplateClone = oTemplate.clone();
-
-			if (!oTable._isOfType(TableType.ResponsiveTable)) {
-				if (this._oTemplateClone.setWrapping) {
-					this._oTemplateClone.setWrapping(false);
-				}
-
-				if (this._oTemplateClone.setRenderWhitespace) {
-					this._oTemplateClone.setRenderWhitespace(false);
-				}
-			}
 		}
 
 		return this._oTemplateClone;
 	};
 
-	Column.prototype.getCreationTemplateClone = function() {
-		const oTable = this.getTable();
-		const oCreationTemplate = this.getCreationTemplate();
-
-		if (oTable && oCreationTemplate && (!this._oCreationTemplateClone || this._oCreationTemplateClone.isDestroyed())) {
-			this._oCreationTemplateClone = oCreationTemplate.clone();
-
-			if (!oTable._isOfType(TableType.ResponsiveTable)) {
-				if (this._oCreationTemplateClone.setWrapping) {
-					this._oCreationTemplateClone.setWrapping(false);
-				}
-
-				if (this._oCreationTemplateClone.setRenderWhitespace) {
-					this._oCreationTemplateClone.setRenderWhitespace(false);
-				}
-			}
-		}
-
-		return this._oCreationTemplateClone;
-	};
-
 	Column.prototype.setHeader = function(sHeader) {
 		this.setProperty("header", sHeader, true);
 
@@ -531,7 +387,7 @@ sap.ui.define([
 
 		if (oPropertyHelper) {
 			oPropertyHelper.calculateColumnWidth(this).then((sWidth) => {
-				this._oSettingsModel.setProperty("/calculatedWidth", sWidth);
+				this._oManagedObjectModel.setProperty("/@custom/calculatedWidth", sWidth);
 			});
 		} else {
 			oTable._fullyInitialized().then(this._calculateColumnWidth.bind(this));
@@ -544,7 +400,7 @@ sap.ui.define([
 		const oXConfig = oTable._getXConfig();
 		const oColumnConfig = oXConfig?.aggregations?.columns?.[sPropertyKey];
 
-		this._oSettingsModel.setProperty("/p13nWidth", oColumnConfig?.width);
+		this._oManagedObjectModel.setProperty("/@custom/p13nWidth", oColumnConfig?.width);
 	};
 
 	Column.prototype.getTable = function() {
@@ -557,10 +413,8 @@ sap.ui.define([
 		this._oInnerColumnReady = null;
 		[
 			"_oManagedObjectModel",
-			"_oSettingsModel",
 			"_oInnerColumn",
 			"_oTemplateClone",
-			"_oCreationTemplateClone",
 			"_oColumnHeaderLabel"
 		].forEach(function(sObject) {
 			if (this[sObject]) {

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @class The table type info class for the metadata-driven table.
 	 * @extends sap.ui.core.Element
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @author SAP SE
 	 * @constructor
 	 * @public

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * {@link sap.ui.mdc.table.Column#getCreationTemplate creationTemplate} aggregation of the {@link sap.ui.mdc.table.Column}.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.fe

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.dnd.DragDropBase
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @public
 	 * @since 1.119

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

@@ -8,16 +8,16 @@ sap.ui.define([
 	"./TableTypeBase",
 	"./menus/GroupHeaderRowContextMenu",
 	"../enums/TableRowCountMode",
-	"sap/m/table/Util",
 	"./utils/Personalization",
+	"sap/m/library",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/core/Lib"
 ], (
 	TableTypeBase,
 	GroupHeaderRowContextMenu,
 	TableRowCountMode,
-	MTableUtil,
 	PersonalizationUtils,
+	MLibrary,
 	JSONModel,
 	Library
 ) => {
@@ -256,14 +256,14 @@ sap.ui.define([
 		});
 	};
 
-	GridTableType.prototype.createTable = function(sId) {
+	GridTableType.prototype.createTable = function() {
 		const oTable = this.getTable();
 
 		if (!oTable || !InnerTable) {
 			return null;
 		}
 
-		const oGridTable = new InnerTable(sId, this.getTableSettings());
+		const oGridTable = new InnerTable(this.getTableSettings());
 
 		oGridTable.setAggregation("groupHeaderRowContextMenu", new GroupHeaderRowContextMenu());
 
@@ -277,6 +277,7 @@ sap.ui.define([
 		};
 		const mRowSettingsConfig = this.getRowSettingsConfig();
 		const mSettings = {
+			...TableTypeBase.prototype.getTableSettings.apply(this, arguments),
 			enableBusyIndicator: true,
 			enableColumnReordering: false,
 			threshold: {
@@ -317,7 +318,7 @@ sap.ui.define([
 			mSettings.cellClick = [onCellClick, this];
 		}
 
-		return Object.assign({}, TableTypeBase.prototype.getTableSettings.apply(this, arguments), mSettings);
+		return mSettings;
 	};
 
 	function onCellClick(oEvent) {
@@ -341,8 +342,34 @@ sap.ui.define([
 		});
 	}
 
-	GridTableType.createColumn = function(sId, mSettings) {
-		return new InnerColumn(sId, mSettings);
+	GridTableType.prototype.createColumn = function(oColumn) {
+		const oGridTableColumn = new InnerColumn(this.getColumnSettings(oColumn));
+		const oCreationTemplate = oColumn.getCreationTemplate()?.clone();
+
+		oCreationTemplate?.setWrapping?.(false);
+		oGridTableColumn.setCreationTemplate(oCreationTemplate);
+
+		return oGridTableColumn;
+	};
+
+	GridTableType.prototype.getColumnSettings = function(oColumn) {
+		const oTemplate = oColumn.getTemplateClone();
+
+		oTemplate?.setWrapping?.(false);
+
+		return {
+			...TableTypeBase.prototype.getColumnSettings.apply(this, arguments),
+			label: oColumn.getHeaderLabel({wrapping: false}),
+			template: oTemplate,
+			minWidth: {
+				path: "$sap.ui.mdc.table.Column>/minWidth",
+				formatter: function(fMinWidth) {
+					return Math.round(fMinWidth * parseFloat(MLibrary.BaseFontSize));
+				}
+			},
+			resizable: "{$sap.ui.mdc.Table>/enableColumnResize}",
+			autoResizable: "{$sap.ui.mdc.Table>/enableColumnResize}"
+		};
 	};
 
 	GridTableType.prototype.enableColumnResize = function() {
@@ -524,26 +551,13 @@ sap.ui.define([
 	};
 
 	GridTableType.prototype.scrollToIndex = function(iIndex) {
-		const oTable = this.getTable();
 		const oGridTable = this.getInnerTable();
 
 		if (!oGridTable) {
 			return Promise.reject();
 		}
 
-		return new Promise((resolve) => {
-			if (iIndex === -1) {
-				iIndex = MTableUtil.isEmpty(oTable.getRowBinding()) ? 0 : oTable.getRowBinding().getLength();
-			}
-
-			if (oGridTable._setFirstVisibleRowIndex(iIndex)) {
-				oGridTable.attachEventOnce("rowsUpdated", () => {
-					resolve();
-				});
-			} else {
-				resolve();
-			}
-		});
+		return oGridTable._scrollToIndex(iIndex);
 	};
 
 	GridTableType.prototype.getRowBinding = function() {

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.table.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @private
 	 * @since 1.85

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 *
 	 * @private
 	 * @since 1.83

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @class The table type info class for the metadata-driven table.
 	 * @extends sap.ui.mdc.table.ColumnSettings
-	 * @version 1.141.2
+	 * @version 1.143.0
 	 * @author SAP SE
 	 * @constructor
 	 * @public