@openui5/sap.ui.mdc 1.134.0 → 1.136.0

package/src/sap/ui/mdc/valuehelp/content/FixedList.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element showing a list with fixed values.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -60,7 +60,7 @@ sap.ui.define([
 				 * For small lists, all values are meant to be shown, independent of the typing in the connected field.
 				 * In this case this property must be set to <code>false</code>.
 				 *
-				 * If not set, the list opens if the user clicks into the connected field.
+				 * By default, if not set, the list opens if the user clicks into the connected field.
 				 */
 				filterList: {
 					type: "boolean",
@@ -123,6 +123,11 @@ sap.ui.define([
 				"sap/ui/model/base/ManagedObjectModel",
 				"sap/base/strings/whitespaceReplacer"
 			]).then((aModules) => {
+
+				if (this.isDestroyStarted()) {
+					return null;
+				}
+
 				const List = aModules[0];
 				const DisplayListItem = aModules[1];
 				const mLibrary = aModules[2];
@@ -224,7 +229,13 @@ sap.ui.define([
 	function _setConditions(vKey, sValue) {
 
 		const oCondition = this.createCondition(vKey, sValue);
-		this.setProperty("conditions", [oCondition], true);
+		const aOldConditions = this.getConditions();
+
+		if (deepEqual([oCondition], aOldConditions)) {
+			_updateSelection.call(this); // as selection might be changed
+		} else {
+			this.setProperty("conditions", [oCondition], true);
+		}
 
 		return oCondition;
 
@@ -282,6 +293,7 @@ sap.ui.define([
 			const aConditions = this.getConditions();
 			let vSelectedKey;
 			let bFirstFilterItemSelected = false;
+			const bIsOpen = this.getParent().isOpen();
 
 			if (aConditions.length > 0 && (aConditions[0].validated === ConditionValidated.Validated || aConditions[0].operator === OperatorName.EQ /*oOperator.name*/ )) {
 				vSelectedKey = aConditions[0].values[0];
@@ -295,11 +307,17 @@ sap.ui.define([
 					if (aConditions.length > 0 && _getKey.call(this, oOriginalItem) === vSelectedKey) {
 						// conditions given -> use them to show selected items
 						oListItem.setSelected(true);
-					} else if (aConditions.length === 0 && this._iNavigateIndex < 0 && !bFirstFilterItemSelected && this._sHighlightId === oListItem.getId()) {
+						if (bIsOpen && !oListItem.hasStyleClass("sapMLIBFocused")) { // to also update acc-descriptions
+							oList.setFakeFocus(oListItem);
+						}
+				} else if (aConditions.length === 0 && this._iNavigateIndex < 0 && !bFirstFilterItemSelected && this._sHighlightId === oListItem.getId()) {
 						oListItem.setSelected(true);
 						bFirstFilterItemSelected = true;
 					} else {
 						oListItem.setSelected(false);
+						if (bIsOpen && oListItem.hasStyleClass("sapMLIBFocused")) { // to also update acc-descriptions
+							oList.setFakeFocus();
+						}
 					}
 				}
 			});
@@ -403,7 +421,17 @@ sap.ui.define([
 	};
 
 	FixedList.prototype.handleConditionsUpdate = function(oChanges) {
-		_updateSelection.call(this);
+		if (this._iNavigateIndex >= 0 && !this._bConditionSetByNavigate) { // if conditions updated initialize navigation
+			const aConditions = this.getConditions();
+			const oList = _getList.call(this);
+			const oItem = oList.getSelectedItem();
+			const oOriginalItem = oItem && _getOriginalItem.call(this, oItem);
+			if (aConditions.length !== 1 || !_getKey.call(this, oOriginalItem) === aConditions[0].values[0]) {
+				this._iNavigateIndex = -1;
+			}
+		}
+
+		_updateSelection.call(this); // no async handling needed here as 1. no multiple calls triggered in a direct chain and 2. no aria-issues, as List don't set aria-selected
 	};
 
 	FixedList.prototype.handleFilterValueUpdate = function(oChanges) {
@@ -514,13 +542,11 @@ sap.ui.define([
 		const oItem = aItems[iSelectedIndex];
 		if (oItem) {
 			const bUseFirstMatch = this.getUseFirstMatch(); // if item for first match is selected, navigate to it needs to fire the event
-			if (oItem !== oSelectedItem || (bUseFirstMatch && !bLeaveFocus) || iStep === 0) { // new item or already shown item is navigated again (focus set on dropdown)
+			if (oItem !== oSelectedItem || (bUseFirstMatch && !bLeaveFocus) || (this._iNavigateIndex !== iSelectedIndex && !bLeaveFocus)) { // new item or already selected or highlighted item is navigated (focus set on dropdown)
 				let oOriginalItem, vKey, vDescription;
 
 				this._iNavigateIndex = iSelectedIndex;
 
-				oItem.setSelected(true); // does nothing for GroupHeader
-
 				if (bIsOpen) {
 					oList.scrollToIndex(iSelectedIndex); // only possible if open
 					// in case of a single value field fake the focus on the new selected item to update the screenreader invisible text
@@ -528,13 +554,17 @@ sap.ui.define([
 				}
 
 				if (oItem.isA("sap.m.GroupHeaderListItem")) {
+					this._bConditionSetByNavigate = true;
 					this.setProperty("conditions", [], true); // no condition navigated
+					delete this._bConditionSetByNavigate;
 					this.fireNavigated({ condition: undefined, itemId: oItem.getId(), leaveFocus: false });
 				} else {
 					oOriginalItem = _getOriginalItem.call(this, oItem);
 					vKey = _getKey.call(this, oOriginalItem);
 					vDescription = _getText.call(this, oOriginalItem);
+					this._bConditionSetByNavigate = true;
 					const oCondition = _setConditions.call(this, vKey, vDescription);
+					delete this._bConditionSetByNavigate;
 					const oValueHelpDelegate = this.getValueHelpDelegate();
 					const bCaseSensitive = oValueHelpDelegate.isFilteringCaseSensitive(this.getValueHelpInstance(), this);
 					this.fireNavigated({ condition: oCondition, itemId: oItem.getId(), leaveFocus: false, caseSensitive: bCaseSensitive });
@@ -544,6 +574,7 @@ sap.ui.define([
 					this.fireVisualFocusSet();
 				}
 			} else if (bLeaveFocus) {
+				this._iNavigateIndex = -1; // initialize navigation but keep coditions to show last navigated one as selected
 				this.fireNavigated({ condition: undefined, itemId: undefined, leaveFocus: bLeaveFocus });
 			}
 		}
@@ -552,33 +583,35 @@ sap.ui.define([
 
 	FixedList.prototype.onShow = function(bInitial) {
 
-		ListContent.prototype.onShow.apply(this, arguments);
+		return ListContent.prototype.onShow.apply(this, arguments).then(() => {
+			// scroll to selected item
+			const oList = _getList.call(this);
+			let sItemId;
 
-		// scroll to selected item
-		const oList = _getList.call(this);
-		let sItemId;
-
-		if (!oList) {
-			return null; // TODO: should not happen? Create List?
-		}
+			if (!oList) {
+				return null; // TODO: should not happen? Create List?
+			}
 
-		const oSelectedItem = oList.getSelectedItem();
-		if (oSelectedItem) {
-			const iSelectedIndex = oList.indexOfItem(oSelectedItem);
-			oList.scrollToIndex(iSelectedIndex);
-			sItemId = oSelectedItem.getId();
-		}
+			const oSelectedItem = oList.getSelectedItem();
+			if (oSelectedItem) {
+				const iSelectedIndex = oList.indexOfItem(oSelectedItem);
+				oList.scrollToIndex(iSelectedIndex);
+				sItemId = oSelectedItem.getId();
+			}
 
-		const aRelevantContexts = this.getListBinding()?.getCurrentContexts();
-		const iItems = aRelevantContexts?.length;
+			const aRelevantContexts = this.getListBinding()?.getCurrentContexts();
+			const iItems = aRelevantContexts?.length;
 
-		return {itemId: sItemId, items: iItems};
+			return {itemId: sItemId, items: iItems};
+		});
 
 	};
 
 	FixedList.prototype.onHide = function() {
 
 		this.removeVisualFocus();
+		const oList = _getList.call(this);
+		oList?.setFakeFocus(); // to add it again if reopened
 
 		this._iNavigateIndex = -1; // initialize after closing
 
@@ -606,6 +639,11 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Determines if the value help should be opened when the user clicks into the connected control.
+	 *
+	 * @returns {boolean} If <code>true</code>, the value help should open when user clicks into the connected field control
+	 */
 	FixedList.prototype.shouldOpenOnClick = function() {
 
 		return !this.getFilterList(); // TODO: own property, maybe general at content?
@@ -624,12 +662,6 @@ sap.ui.define([
 
 	};
 
-	FixedList.prototype.shouldOpenOnNavigate = function() {
-
-		return !ListContent.prototype.isSingleSelect.apply(this);
-
-	};
-
 	FixedList.prototype.isNavigationEnabled = function(iStep) {
 
 		return this.getItems().length > 0; // always enabled if items
@@ -656,8 +688,10 @@ sap.ui.define([
 	};
 
 	FixedList.prototype.setHighlightId = function (sItemId) {
-		this._sHighlightId = sItemId;
-		_updateSelection.call(this);
+		if (this._sHighlightId !== sItemId) {
+			this._sHighlightId = sItemId;
+			_updateSelection.call(this);
+		}
 	};
 
 	FixedList.prototype.destroyItems = function () {

package/src/sap/ui/mdc/valuehelp/content/FixedListItem.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.ListItem
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @public
 	 * @since 1.114.0

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.ui.mdc.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -104,7 +104,7 @@ sap.ui.define([
 		this._bSelectionIsUpdating = false;
 	};
 
-	MDCTable.prototype.handleConditionsUpdate = function() {
+	MDCTable.prototype.handleConditionsUpdate = function(oChanges) {
 		if (!this._bIgnoreNextConditionChange) {
 			// When new conditions are set from outside (connected control or dialog tokenizer) we have to sync all the table selection once
 			this._setTableSelectionState();
@@ -220,6 +220,10 @@ sap.ui.define([
 				"sap/ui/layout/FixFlex", "sap/m/VBox", "sap/m/ScrollContainer"
 			]).then((aModules) => {
 
+				if (this.isDestroyStarted()) {
+					return null;
+				}
+
 				const FixFlex = aModules[0];
 				const VBox = aModules[1];
 				const ScrollContainer = aModules[2];
@@ -327,7 +331,7 @@ sap.ui.define([
 	};
 
 	MDCTable.prototype.onShow = function() {
-		FilterableListContent.prototype.onShow.apply(this, arguments);
+		return FilterableListContent.prototype.onShow.apply(this, arguments);
 	};
 
 	MDCTable.prototype.onBeforeShow = function(bInitial) {