@openui5/sap.ui.mdc 1.124.2 → 1.126.0

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

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * The metadata information is provided via the {@link module:sap/ui/mdc/FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @public
 	 * @since 1.61.0
@@ -158,7 +158,7 @@ sap.ui.define([
 				text: "{" + FilterBarBase.INNER_MODEL_NAME + ">/_filterCount}",
 				press: this.onAdaptFilters.bind(this)
 			});
-			this._btnAdapt.setAriaHasPopup(HasPopup.ListBox);
+			this._btnAdapt.setAriaHasPopup(HasPopup.Dialog);
 			this._btnAdapt.setModel(this._oModel, FilterBarBase.INNER_MODEL_NAME);
 
 			this._btnAdapt.bindProperty("visible", {
@@ -232,18 +232,66 @@ sap.ui.define([
 
 		return this._retrieveMetadata().then(() => {
 			return this.getEngine().show(this, "Item", {
-					reset: function() {
-						this.getEngine().reset(this);
-						this._getConditionModel().checkUpdate(true);
-					}.bind(this)
-				})
+				reset: function() {
+					this.getEngine().reset(this);
+					this._getConditionModel().checkUpdate(true);
+				}.bind(this)
+			})
 				.then((oPopup) => {
+					this._aAddedFilterFields = [];
+					this._aRemovedFilterFields = [];
+					oPopup.attachEventOnce("afterClose", this._determineFilterFieldOnFocus.bind(this));
 					return oPopup;
 				});
 		});
 
 	};
 
+	FilterBar.prototype._determineFilterFieldOnFocus = function() {
+
+		let oFilterField = null;
+		const aFilterFields = this.getFilterItems();
+		if (this._aAddedFilterFields && this._aAddedFilterFields.length > 0) {
+			[oFilterField] = this._aAddedFilterFields;
+			for (let i = 1; i < this._aAddedFilterFields.length; i++) {
+				if (aFilterFields.indexOf(oFilterField) > aFilterFields.indexOf(this._aAddedFilterFields[i])) {
+					oFilterField = this._aAddedFilterFields[i];
+				}
+			}
+		} else if (this._aRemovedFilterFields && this._aRemovedFilterFields.length > 0) {
+			[oFilterField] = aFilterFields;
+		}
+
+		if (oFilterField) {
+			this._setFocusOnFilterField(oFilterField);
+		}
+
+		this._aAddedFilterFields = undefined;
+		this._aRemovedFilterFields = undefined;
+	};
+
+	FilterBar.prototype._handleAddedFilterField = function(oFilterField) {
+		if (this._aAddedFilterFields && this._aRemovedFilterFields) {
+			const nDelIdx = this._aRemovedFilterFields.indexOf(oFilterField);
+			if (nDelIdx < 0) {
+				this._aAddedFilterFields.push(oFilterField);
+			} else {
+				this._aRemovedFilterFields.splice(nDelIdx, 1);
+			}
+		}
+	};
+	FilterBar.prototype._handleRemovedFilterField = function(oFilterField) {
+		if (this._aRemovedFilterFields) {
+			this._aRemovedFilterFields.push(oFilterField);
+		}
+	};
+
+	FilterBar.prototype._setFocusOnFilterField = function(oFilterField) {
+		if (oFilterField) {
+			oFilterField.focus();
+		}
+	};
+
 	/**
 	 * Returns the external conditions of the inner condition model.
 	 * <b>Note:</b> This API returns only attributes related to the {@link sap.ui.mdc.FilterBar#setP13nMode p13nMode} property configuration.

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * <li>In edit mode, usually an {@link sap.m.Input Input} control is rendered.</li>
 	 * <li>If multiple values are allowed, a {@link sap.m.MultiInput MultiInput} control is rendered.</li>
 	 * <li>If <code>multipleLines</code> is set, a {@link sap.m.TextArea TextArea} control is rendered.</li>
-	 * <li>If a date type or a date/time type is used, a {@link sap.m.DateRangeSelection DateRangeSelection} control is rendered.</li>
+	 * <li>If a date type or a date/time type is used and only one condition is supported, a {@link sap.m.DynamicDateRange DynamicDateRange} control is rendered.</li>
 	 * <li>If a date type is used and only single values are allowed, a {@link sap.m.DatePicker DatePicker} control is rendered.</li>
 	 * <li>If a date type is used and only single ranges are allowed, a {@link sap.m.DateRangeSelection DateRangeSelection} control is rendered.</li>
 	 * <li>If a date/time type is used and only single values are allowed, a {@link sap.m.DateTimePicker DateTimePicker} control is rendered.</li>
@@ -53,11 +53,11 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent, sap.m.IOverflowToolbarContent
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @since 1.48.0
 	 *
 	 * @public
@@ -173,23 +173,33 @@ sap.ui.define([
 			properties: ["operators", "propertyKey", "additionalDataType"]
 		});
 
+		this._mDescriptionPromises = new Map();
+		this._mDescriptions = new Map();
 	};
 
 	FilterField.prototype.exit = function() {
 
+		this._mDescriptionPromises = null;
+		this._mDescriptions = null;
+
 		FieldBase.prototype.exit.apply(this, arguments);
 
 	};
 
-	// TODO: remove fallback if propertyKey is used by stakeholders
-	FilterField.prototype.getPropertyKey = function() {
-		let sPropertyKey = this.getProperty("propertyKey");
-		if (!sPropertyKey) {
-			sPropertyKey = this.getFieldPath();
-		}
+	/**
+	 * @deprecated Since version 1.115.0
+	 */
+	(() => {
+		FilterField.prototype.getPropertyKey = function() {
+			let sPropertyKey = this.getProperty("propertyKey");
 
-		return sPropertyKey;
-	};
+			if (!sPropertyKey) {
+				sPropertyKey = this.getFieldPath();
+			}
+
+			return sPropertyKey;
+		};
+	})();
 
 	FilterField.prototype.setProperty = function(sPropertyName, oValue, bSuppressInvalidate) {
 
@@ -467,6 +477,53 @@ sap.ui.define([
 
 	};
 
+	const _findConditionMapEntry = (oMap, oCondition) => {
+		return [...oMap.entries()].find((aEntry) => deepEqual(aEntry[0], oCondition));
+	};
+
+	FilterField.prototype.getFormattingPromise = function () {
+		if (this._mDescriptionPromises) {
+			const aRunningPromises = [...this._mDescriptionPromises.values()];
+			if (aRunningPromises?.length) {
+				return Promise.allSettled(aRunningPromises);
+			}
+		}
+		return undefined;
+	};
+
+	FilterField.prototype._persistFormatConditions = function () {
+		if (!this.getFormattingPromise()) { // No running formatting promises? We only want to propagate results when formatting is completely done
+			const aConditions = this.getConditions();
+			const aNextConditions = aConditions.map((oCondition) => {
+				const aFormatConditionEntry = _findConditionMapEntry(this._mDescriptions, oCondition);
+				return aFormatConditionEntry ? aFormatConditionEntry[1] : oCondition; // Replace with formatted condition if available
+			});
+			this.setProperty("conditions", aNextConditions, true);
+			this._mDescriptionPromises.clear();
+			this._mDescriptions.clear();
+		}
+	};
+
+	FilterField.prototype.getFormatOptions = function() {
+		const that = this;
+		return {
+			...FieldBase.prototype.getFormatOptions.apply(this, arguments),
+			awaitFormatCondition: function (oCondition, oFormattingPromise) {
+				const oFormatConditionPromise = oFormattingPromise.then((oFormattedCondition) => {
+					if (oFormattedCondition) {
+						that._mDescriptions.set(oCondition, oFormattedCondition);
+					}
+					return oFormattedCondition;
+				}).finally(() => {
+					that._mDescriptionPromises.delete(oCondition);
+					that._persistFormatConditions();
+				});
+				that._mDescriptionPromises.set(oCondition, oFormatConditionPromise);
+				return oFormatConditionPromise;
+			}
+		};
+	};
+
 	return FilterField;
 
 });

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

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link
@@ -334,14 +334,15 @@ sap.ui.define([
 		this._setConvertedLinkItems(aLinkItems);
 		const aMLinkItems = this._getInternalModel().getProperty("/linkItems");
 
-		if (aMLinkItems.length === 1 && !aAdditionalContent.length) {
+		const bDirectNavigation = (aMLinkItems.length === 1 && !aAdditionalContent.length);
+		if (bDirectNavigation) {
 			const bNavigate = await this._beforeNavigationCallback(oEvent);
 			if (bNavigate) {
 				Panel.navigate(aMLinkItems[0].href);
 			}
-			return bNavigate;
 		}
-		return false;
+
+		return bDirectNavigation;
 	};
 
 	/**
@@ -663,7 +664,7 @@ sap.ui.define([
 	Link.prototype._getSourceControl = function() {
 		const vSourceControlAssociation = this.getAssociation("sourceControl");
 		const oSourceControl = vSourceControlAssociation && typeof vSourceControlAssociation === "string" ? Element.getElementById(vSourceControlAssociation) : vSourceControlAssociation;
-		return  oSourceControl ?? this.getSourceControl();
+		return oSourceControl ?? this.getSourceControl();
 	};
 
 	return Link;

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @since 1.93.0
 	 *
 	 * @public

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

@@ -1303,7 +1303,7 @@ sap.ui.define([
 			return this;
 		}
 		this.setProperty("headerStyle", sStyle, true);
-		this._oTitle && this._oTitle.setTitleStyle(this.getHeaderStyle() || TitleLevel.H4);
+		this._oTitle?.setTitleStyle(this.getHeaderStyle() || TitleLevel[ThemeParameters.get({name: "_sap_ui_mdc_Table_HeaderStyle"})]);
 		return this;
 	};
 
@@ -1569,6 +1569,7 @@ sap.ui.define([
 			active: true,
 			design: ToolbarDesign.Info,
 			visible: false,
+			ariaLabelledBy: sToolbarId + "-text",
 			content: [
 				new Text({
 					id: sToolbarId + "-text",
@@ -1971,7 +1972,7 @@ sap.ui.define([
 				text: this.getHeader(),
 				width: this.getHeaderVisible() ? undefined : "0px",
 				level: this.getHeaderLevel(),
-				titleStyle: this.getHeaderStyle() || TitleLevel.H4
+				titleStyle: this.getHeaderStyle() || TitleLevel[ThemeParameters.get({name: "_sap_ui_mdc_Table_HeaderStyle"})]
 			});
 			// Create Toolbar
 			this._oToolbar = new ActionToolbar(this.getId() + "-toolbar", {
@@ -3063,6 +3064,11 @@ sap.ui.define([
 			const sToolBarDesign = ToolbarDesign[ThemeParameters.get({name: "_sap_ui_mdc_Table_ToolbarDesign"})];
 			this._oToolbar.setDesign(sToolBarDesign);
 		}
+
+		if (this._oTitle && !this.getHeaderStyle()) {
+			const sHeaderStyle = TitleLevel[ThemeParameters.get({name: "_sap_ui_mdc_Table_HeaderStyle"})];
+			this._oTitle.setTitleStyle(sHeaderStyle);
+		}
 	};
 
 	/**

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

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * and {@link sap.ui.mdc.FilterField FilterField} controls using the <code>valueHelp</code> association. One <code>ValueHelp</code> element instance can be
 	 * assigned to multiple fields (like in different table rows). It should be placed in the control tree on the container holding the fields.
 	 * @extends sap.ui.mdc.Element
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -85,6 +85,9 @@ sap.ui.define([
 				 * belongs to, not by the application.
 				 *
 				 * <b>Note:</b> A condition must have the structure of {@link sap.ui.mdc.condition.ConditionObject ConditionObject}.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				conditions: {
 					type: "object[]",
@@ -123,6 +126,9 @@ sap.ui.define([
 				 *
 				 * <b>Note:</b> This property must only be set by the control the <code>ValueHelp</code> element
 				 * belongs to, not by the application.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				filterValue: {
 					type: "string",
@@ -181,6 +187,9 @@ sap.ui.define([
 				 *
 				 * <b>Note:</b> This event must only be handled by the control the <code>ValueHelp</code> element
 				 * belongs to, not by the application.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				select: {
 					parameters: {
@@ -209,6 +218,9 @@ sap.ui.define([
 				 *
 				 * <b>Note:</b> This event must only be handled by the control the <code>ValueHelp</code> element
 				 * belongs to, not by the application.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				disconnect: {},
 
@@ -247,6 +259,9 @@ sap.ui.define([
 
 				/**
 				 * This event is fired after the user navigated, using the arrow keys, in the value help.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				navigated: {
 					parameters: {
@@ -268,10 +283,16 @@ sap.ui.define([
 				},
 				/**
 				 * This event is fired if the user wants to switch from typeahead to value help.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 */
 				switchToValueHelp: {},
 				/**
 				 * This event is fired after a suggested item has been found for a type-ahead.
+				 *
+				 * @private
+				 * @ui5-restricted sap.ui.mdc.field.FieldBase
 				 * @since 1.120.0
 				 */
 				typeaheadSuggested: {

package/src/sap/ui/mdc/actiontoolbar/ActionToolbarAction.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * The action for an {@link sap.ui.mdc.ActionToolbar ActionToolbar} control with given layout information that determines where the wrapped control is displayed on the <code>ActionToolbar</code>.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @since 1.58
 	 * @public

package/src/sap/ui/mdc/chart/ChartImplementationContainer.js

@@ -21,7 +21,7 @@ sap.ui.define([
 		 * @class The <code>ChartImplementationContainer</code> creates a container for the <code>content</code> (chart) and <code>noDataContent</code>. Based on the <code>showNoDataStruct</code> the <code>content</code> or <code>noDataContent</code> will be shown.
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.124.2
+		 * @version 1.126.0
 		 * @constructor
 		 *
 		 * @public