@openui5/sap.ui.mdc 1.134.0 → 1.136.0

package/src/sap/ui/mdc/valuehelp/FilterBar.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.
  */
 sap.ui.define(
@@ -39,7 +39,7 @@ sap.ui.define(
 		 * <b>Note:</b> The <code>FilterBar</code> can only be used for a {@link sap.ui.mdc.valuehelp.Dialog Dialog} and not on its own.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.134.0
+		 * @version 1.136.0
 		 * @constructor
 		 * @public
 		 * @since 1.124.0

package/src/sap/ui/mdc/valuehelp/FilterBarDelegate.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.
  */
 

package/src/sap/ui/mdc/valuehelp/FilterContainer.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.
  */
 

package/src/sap/ui/mdc/valuehelp/Popover.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.
  */
 
@@ -11,7 +11,8 @@ sap.ui.define([
 	'sap/ui/mdc/util/loadModules',
 	'sap/ui/thirdparty/jquery',
 	'sap/ui/core/library',
-	'sap/ui/Device'
+	'sap/ui/Device',
+	'sap/ui/mdc/enums/RequestShowContainerReason'
 ], (
 	Container,
 	OperatorName,
@@ -19,7 +20,8 @@ sap.ui.define([
 	loadModules,
 	jQuery,
 	coreLibrary,
-	Device
+	Device,
+	RequestShowContainerReason
 ) => {
 	"use strict";
 
@@ -35,7 +37,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element showing a popover.
 	 * @extends sap.ui.mdc.valuehelp.base.Container
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 *
 	 * @public
@@ -115,11 +117,14 @@ sap.ui.define([
 		const oPopover = this.getAggregation("_container");
 
 		if (!oPopover) {
-			if (Device.system.phone) {
-				return _getContainerControlPhone.call(this);
-			} else {
-				return _getContainerControlDesktop.call(this);
+			if (!this._oGetContainerControlPromise) {
+				if (Device.system.phone) {
+					this._oGetContainerControlPromise = _getContainerControlPhone.call(this);
+				} else {
+					this._oGetContainerControlPromise =  _getContainerControlDesktop.call(this);
+				}
 			}
+			return this._oGetContainerControlPromise;
 		}
 
 		let oValueHelpHeader;
@@ -194,6 +199,11 @@ sap.ui.define([
 			"sap/ui/core/InvisibleText",
 			"sap/ui/core/Lib"
 		]).then((aLoaded) => {
+
+			if (this.isDestroyStarted()) {
+				return null;
+			}
+
 			let MPopover, MLibrary, ValueStateHeader, InvisibleText, Library;
 			[MPopover, MLibrary, Toolbar, ToolbarSpacer, ValueStateHeader, InvisibleText, Library] = aLoaded;
 
@@ -281,8 +291,14 @@ sap.ui.define([
 			"sap/ui/model/ParseException",
 			"sap/ui/mdc/field/ConditionType"
 		]).then((aLoaded) => {
+
+			if (this.isDestroyStarted()) {
+				return null;
+			}
+
 			let Dialog, Input, Button, ToggleButton, Bar, ScrollContainer, Title, ValueStateHeader, List, StandardListItem, MLibrary, IconPool, InvisibleText, Library, BindingMode, ParseException, ConditionType;
 			[Dialog, Input, Button, ToggleButton, Bar, ScrollContainer, Title, Toolbar, ToolbarSpacer, ValueStateHeader, List, StandardListItem, MLibrary, IconPool, InvisibleText, Library, BindingMode, FormatException, ParseException, ConditionType] = aLoaded;
+
 			const {TitleAlignment, ListMode, ListType} = MLibrary;
 			const oResourceBundleM = Library.getResourceBundleFor("sap.m");
 			const bSingleSelect = this.isSingleSelect();
@@ -570,14 +586,10 @@ sap.ui.define([
 
 		const oContent = this._getContent();
 		const oOpenPromise = this._retrievePromise("open");
-		Promise.resolve(oContent && oContent.onBeforeShow(true)).then(() => { // onBeforeShow should guarantee filtering is done, when we observe the table in showTypeahead
-			const oDelegate = this.getValueHelpDelegate();
+		Promise.resolve(oContent && oContent.onBeforeShow(true)).then(async () => { // onBeforeShow should guarantee filtering is done, when we observe the table in showTypeahead
 			const oValueHelp = this.getValueHelp();
-
-			return Promise.resolve(bTypeahead ? oDelegate.showTypeahead(oValueHelp, oContent) : true).then((bShowTypeahead) => {
-				// Only continue the opening process, if delegate confirms "showTypeahead" and open promise is not canceled (might happen due to focus loss in target control).
-				return bShowTypeahead && !oOpenPromise.isCanceled() ? true : Promise.reject();
-			});
+			const bShowTypeahead = bTypeahead ? await oValueHelp._requestShowContainer(this, RequestShowContainerReason.Filter) : true;
+			return bShowTypeahead && !oOpenPromise.isCanceled() ? true : Promise.reject(); // Only continue the opening process, if delegate confirms "showTypeahead" and open promise is not canceled (might happen due to focus loss in target control).
 		}).then(() => {
 			if (Device.system.phone) {
 				oPopover.open();
@@ -585,10 +597,16 @@ sap.ui.define([
 				this._openContainerByTarget(oPopover);
 			}
 		}).catch((oError) => {
-			this._cancelPromise(oOpenPromise);
-			if (oError && oError instanceof Error) { // Re-throw actual errors
-				throw oError;
+			const oCurrentOpenPromise = this._retrievePromise("open");
+
+			const bCancelOpen = oOpenPromise === oCurrentOpenPromise; // only cancel if open promise is still the same (may change if valuehelp is opened again in another context)
+			if (bCancelOpen) {
+				this._cancelPromise(oOpenPromise);
+				if (oError && oError instanceof Error) { // Re-throw actual errors
+					throw oError;
+				}
 			}
+
 		});
 	};
 
@@ -604,11 +622,18 @@ sap.ui.define([
 		}
 	};
 
-	Popover.prototype.closeContainer = function() {
+	Popover.prototype.closeContainer = function(bDoNotRestoreFocus) {
 
 		Container.prototype.closeContainer.apply(this, arguments);
 		const oPopover = this.getAggregation("_container");
 		if (oPopover) {
+			if (bDoNotRestoreFocus) {
+				if (Device.system.phone) {
+					oPopover.oPopup._oPreviousFocus = null; // TODO - find real solution
+				} else {
+					oPopover._oPreviousFocus = null; // TODO - find real solution
+				}
+			}
 			oPopover.close();
 		}
 
@@ -619,15 +644,16 @@ sap.ui.define([
 		this._resolvePromise("open");
 
 		const oContent = this._getContent();
-		let oShowResult;
 
 		if (oContent) {
 			oContent.onContainerOpen();
-			oShowResult = oContent.onShow(true);
+			oContent.onShow(true).then((oShowResult) => {
+				this.fireOpened({ itemId: oShowResult?.itemId, items: oShowResult?.items });
+			});
+		} else {
+			this.fireOpened({ itemId: undefined, items: undefined });
 		}
 
-		this.fireOpened({ itemId: oShowResult?.itemId, items: oShowResult?.items });
-
 	};
 
 	Popover.prototype.handleConfirmed = function(oEvent) {
@@ -674,7 +700,11 @@ sap.ui.define([
 
 		const oPopover = this.getAggregation("_container");
 		if (oPopover) {
-			oPopover._oPreviousFocus = null; // TODO - find real solution
+			if (Device.system.phone) {
+				oPopover.oPopup._oPreviousFocus = null; // TODO - find real solution
+			} else {
+				oPopover._oPreviousFocus = null; // TODO - find real solution
+			}
 		}
 
 		Container.prototype.handleClosed.apply(this, arguments);
@@ -692,6 +722,7 @@ sap.ui.define([
 
 	Popover.prototype.navigateInContent = function(iStep) {
 		const oContent = this._getContent();
+		this.bindContentToContainer(oContent); // adds navigation listener
 		if (oContent) {
 			oContent.navigate(iStep);
 		}
@@ -747,6 +778,11 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Determines if the value help should be opened when the user used the arrow keys.
+	 *
+	 * @returns {boolean} If <code>true</code>, the value help should open when user used the arrow keys in the connected field control
+	 */
 	Popover.prototype.shouldOpenOnNavigate = function() {
 
 		const oContent = this._getContent();
@@ -782,6 +818,16 @@ sap.ui.define([
 
 	};
 
+	/**
+	 * Determines if the content of the container supports typeahead.
+	 *
+	 * <b>Note:</b> This function is used by the container and content and must not be used from outside
+	 *
+	 * @returns {boolean} Flag if searching is supported
+	 *
+	 * @private
+	 * @ui5-restricted sap.ui.mdc.ValueHelp, sap.ui.mdc.valueHelp.base.Content
+	 */
 	Popover.prototype.isTypeaheadSupported = function() {
 
 		if (Device.system.phone && (this.isSingleSelect() || this.isDialog())) {
@@ -799,6 +845,9 @@ sap.ui.define([
 	};
 
 	Popover.prototype.exit = function() {
+
+		this._oGetContainerControlPromise = undefined;
+
 		if (this._oCurrentContent) {
 			if (!this._oCurrentContent.isDestroyed()) {
 				this._oCurrentContent.destroy();

package/src/sap/ui/mdc/valuehelp/base/Container.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.
  */
 
@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new element
 	 * @class Container for the {@link sap.ui.mdc.ValueHelp ValueHelp} element.
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 *
@@ -468,11 +468,11 @@ sap.ui.define([
 	/*
 	 * Closes the container.
 	 */
-	Container.prototype.close = function() {
+	Container.prototype.close = function(bDoNotRestoreFocus) {
 		const oPromise = this._retrievePromise("open");
 		if (oPromise) {
 			if (oPromise.isSettled()) {
-				this.closeContainer();
+				this.closeContainer(bDoNotRestoreFocus);
 			} else {
 				this._cancelPromise(oPromise);
 			}
@@ -506,9 +506,10 @@ sap.ui.define([
 
 	/**
 	 * Closes the container control or element.
+	 * @param {boolean} bDoNotRestoreFocus If set, closing must not restore the focus on the field
 	 * @protected
 	 */
-	Container.prototype.closeContainer = function() {
+	Container.prototype.closeContainer = function(bDoNotRestoreFocus) {
 
 	};
 
@@ -901,33 +902,18 @@ sap.ui.define([
 		return oContainer && oContainer.getScrollDelegate && oContainer.getScrollDelegate();
 	};
 
-	/*
-	 * Determines if the value help should be opened when the user focuses the connected control.
-	 *
-	 * @returns {Promise<boolean>} If <code>true</code>, the value help should open when user focuses the connected field control
-	 */
 	Container.prototype.shouldOpenOnFocus = function() {
 		const oDelegate = this.getValueHelpDelegate();
 		const oValueHelp = this.getValueHelp();
 		return oDelegate ? oDelegate.shouldOpenOnFocus(oValueHelp, this) : Promise.resolve(false);
 	};
 
-	/*
-	 * Determines if the value help should be opened when the user clicks into the connected control.
-	 *
-	 * @returns {Promise<boolean>} If <code>true</code>, the value help should open when user clicks into the connected field control
-	 */
 	Container.prototype.shouldOpenOnClick = function() {
 		const oDelegate = this.getValueHelpDelegate();
 		const oValueHelp = this.getValueHelp();
 		return oDelegate ? oDelegate.shouldOpenOnClick(oValueHelp, this) : Promise.resolve(false);
 	};
 
-	/*
-	 * Determines if the value help should be opened when the user used the arrow keys.
-	 *
-	 * @returns {boolean} If <code>true</code>, the value help should open when user used the arrow keys in the connected field control
-	 */
 	Container.prototype.shouldOpenOnNavigate = function() {
 		return false;
 	};

package/src/sap/ui/mdc/valuehelp/base/Content.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.
  */
 
@@ -12,7 +12,8 @@ sap.ui.define([
 	'sap/ui/mdc/condition/FilterOperatorUtil',
 	'sap/ui/mdc/enums/ConditionValidated',
 	'sap/ui/mdc/enums/OperatorValueType',
-	'sap/base/strings/formatMessage'
+	'sap/base/strings/formatMessage',
+	'sap/ui/mdc/enums/RequestShowContainerReason'
 ], (
 	Element,
 	PromiseMixin,
@@ -21,7 +22,8 @@ sap.ui.define([
 	FilterOperatorUtil,
 	ConditionValidated,
 	OperatorValueType,
-	formatMessage
+	formatMessage,
+	RequestShowContainerReason
 ) => {
 	"use strict";
 
@@ -34,7 +36,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.
 	 * @extends sap.ui.core.Element
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 *
@@ -348,7 +350,7 @@ sap.ui.define([
 	 * Called if the content will be shown.
 	 *
 	 * @param {boolean} bInitial Indicates, if the content is shown for the first time since it's container opened.
-	 * @returns {object} Object containing <code>itemId</code> and <code>items</code> where <code>itemId</code> is the ID of the initial selected item if it belongs to the value of the field and <code>items</code> is the number of found items (if it can be determined).
+	 * @returns {Promise<object>} Promise returning Object containing <code>itemId</code> and <code>items</code> where <code>itemId</code> is the ID of the initial selected item if it belongs to the value of the field and <code>items</code> is the number of found items (if it can be determined).
 	 * @private
 	 * @ui5-restricted sap.ui.mdc.valuehelp.base.Container
 	 */
@@ -356,7 +358,7 @@ sap.ui.define([
 		this._bVisible = true;
 		this.handleConditionsUpdate();
 
-		return {};
+		return Promise.resolve({});
 	};
 
 	/**
@@ -439,18 +441,16 @@ sap.ui.define([
 	 * @param {object} oChanges Change
 	 * @protected
 	 */
-	Content.prototype.handleFilterValueUpdate = function(oChanges) {
+	Content.prototype.handleFilterValueUpdate = async function(oChanges) {
 		if (this.isContainerOpen() && this.isTypeahead()) {
-			const oDelegate = this.getValueHelpDelegate();
 			const oValueHelp = this.getValueHelpInstance();
 
 			// Everytime the filterValue changes, we consult the delegate again to decide if the typeahead should still be shown or hidden via a cancel event
 			// Please also see the default implementation of sap.ui.mdc.ValueHelpDelegate.showTypeahead
-			Promise.resolve(!!oDelegate && oDelegate.showTypeahead(oValueHelp, this)).then((bShowTypeahead) => {
-				if (!bShowTypeahead) {
-					this.fireCancel();
-				}
-			});
+			const bCancelOpen = !await oValueHelp._requestShowContainer(this.getParent(), RequestShowContainerReason.Filter);
+			if (bCancelOpen) {
+				this.fireCancel();
+			}
 		}
 	};
 
@@ -695,23 +695,11 @@ sap.ui.define([
 		return this.getMaxConditions() === 1;
 	};
 
-	/*
-	 * 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
-	 */
 	Content.prototype.shouldOpenOnClick = function() {
 		return false;
 	};
 
-	/*
-	 * Determines if the value help should be opened when the user used the arrow keys.
-	 * By default navigation on closed popover is enabled.
-	 *
-	 * @returns {boolean} If <code>true</code>, the value help should open when user used the arrow keys in the connected field control
-	 */
 	Content.prototype.shouldOpenOnNavigate = function() {
-		// return !this.isSingleSelect();
 		return false;
 	};
 

package/src/sap/ui/mdc/valuehelp/base/DefineConditionPanel.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.
  */
 sap.ui.define([
@@ -121,7 +121,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.valuehelp.base.DefineConditionPanel
@@ -336,7 +336,7 @@ sap.ui.define([
 
 			if (!this.getModel("$i18n")) {
 				// if ResourceModel not provided from outside create own one
-				this.setModel(new ResourceModel({ bundleName: "sap/ui/mdc/messagebundle", async: false }), "$i18n");
+				this.setModel(new ResourceModel({ bundleName: "sap/ui/mdc/messagebundle", async: true}), "$i18n");
 			}
 
 			if (this.getConditions().length === 0 && !this._sConditionsTimer) {
@@ -1709,6 +1709,7 @@ sap.ui.define([
 		let oValue0Field = aGridContent[iIndex];
 		let oValue1Field;
 		if (oValue0Field.hasOwnProperty("_iValueIndex") && oValue0Field._iValueIndex === 0) {
+			oValue0Field.setValueHelp?.(_operatorSupportsValueHelp(oCondition.operator) && this._getValueHelp());
 			if (oCondition.values.length > 0) {
 				oValueBindingContext = this._oManagedObjectModel.getContext(oBindingContext.getPath() + "values/0/");
 				oValue0Field.setBindingContext(oValueBindingContext, "$this");

package/src/sap/ui/mdc/valuehelp/base/DialogTab.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.
  */
 
@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @param {object} [mSettings] Initial settings for the new control
 	 * @class Content for the <code>sap.ui.mdc.valuehelp.content.Dialog</code> element.
 	 * @extends sap.ui.core.Control
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/valuehelp/base/FilterableListContent.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.
  */
 
@@ -44,7 +44,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.
 	 * @extends sap.ui.mdc.valuehelp.base.ListContent
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 * @public
@@ -160,9 +160,9 @@ sap.ui.define([
 
 	FilterableListContent.prototype.handleFilterValueUpdate = function(oChanges) {
 		if ((this.isContainerOpening() || this.isContainerOpen()) && this._bContentBound) {
-			Promise.resolve(this.applyFilters()).finally(function() {
-				ListContent.prototype.handleFilterValueUpdate.apply(this, arguments);
-			}.bind(this));
+			Promise.resolve(this.applyFilters()).finally(() => {
+				ListContent.prototype.handleFilterValueUpdate.call(this, oChanges);
+			});
 		}
 	};
 
@@ -302,7 +302,7 @@ sap.ui.define([
 					return loadModules([
 						"sap/ui/mdc/FilterField"
 					]).then((aModules) => {
-						if (!oFilterBar.isDestroyed()) {
+						if (!this.isDestroyStarted() && !oFilterBar.isDestroyed()) {
 							const FilterField = aModules[0];
 							this._oSearchField = new FilterField(this.getId() + "-search", {
 								conditions: "{$filters>/conditions/" + sSearchPath + "}",

package/src/sap/ui/mdc/valuehelp/base/ListContent.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.
  */
 
@@ -21,7 +21,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.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @abstract
 	 * @public

package/src/sap/ui/mdc/valuehelp/content/Bool.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.
  */
 
@@ -20,7 +20,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 to provide a value help for boolean fields.
 	 * @extends sap.ui.mdc.valuehelp.content.FixedList
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -66,6 +66,11 @@ sap.ui.define([
 			return loadModules([
 				"sap/ui/mdc/valuehelp/content/FixedListItem", "sap/ui/model/json/JSONModel"
 			]).then(function(aModules) {
+
+				if (this.isDestroyStarted()) {
+					return null;
+				}
+
 				const FixedListItem = aModules[0];
 				const JSONModel = aModules[1];
 				this._oModel = new JSONModel({
@@ -130,6 +135,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
+	 */
 	Bool.prototype.shouldOpenOnClick = function() {
 
 		return false;

package/src/sap/ui/mdc/valuehelp/content/Conditions.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.
  */
 
@@ -27,7 +27,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 condition panel.
 	 * @extends sap.ui.mdc.valuehelp.base.Content
-	 * @version 1.134.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @public
 	 * @since 1.95.0
@@ -122,6 +122,11 @@ sap.ui.define([
 				aModules.push("sap/m/ScrollContainer");
 			}
 			return loadModules(aModules).then((aModules) => {
+
+				if (this.isDestroyStarted()) {
+					return null;
+				}
+
 				const DefineConditionPanel = aModules[0];
 				const ManagedObjectModel = aModules[1];
 				//					FilterOperatorUtil = aModules[2];
@@ -239,6 +244,11 @@ sap.ui.define([
 				getFooter: function() {
 					return this._retrievePromise("footer", () => {
 						return loadModules(["sap/m/library", "sap/m/Button"]).then((aModules) => {
+
+							if (this.isDestroyStarted()) {
+								return null;
+							}
+
 							const oMLibrary = aModules[0];
 							const { ButtonType } = oMLibrary;
 							const Button = aModules[1];